Replace use of boost::adapters::filtered with ranges::views::filter

snreynolds · Sep 27, 2022 · 565423c · 565423c
1 parent 311b205
commit 565423c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
@@ -30,7 +30,8 @@
 #include <liblangutil/SourceLocation.h>
 #include <libsolutil/StringUtils.h>
 
-#include <boost/range/adaptor/filtered.hpp>
+#include <range/v3/range/conversion.hpp>
+#include <range/v3/view/filter.hpp>
 
 namespace solidity::langutil
 {
@@ -106,9 +107,8 @@ class ErrorReporter
 		std::initializer_list<std::string> const descs = { _descriptions... };
 		solAssert(descs.size() > 0, "Need error descriptions!");
 
-		auto filterEmpty = boost::adaptors::filtered([](std::string const& _s) { return !_s.empty(); });
-
-		std::string errorStr = util::joinHumanReadable(descs | filterEmpty, " ");
+		auto nonEmpty = [](std::string const& _s) { return !_s.empty(); };
+		std::string errorStr = util::joinHumanReadable(descs | ranges::views::filter(nonEmpty) | ranges::to_vector, " ");
 
 		error(_error, Error::Type::TypeError, _location, errorStr);
 	}

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
@@ -66,7 +66,6 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <boost/range/adaptor/filtered.hpp>
 #include <boost/algorithm/string.hpp>
 
 #ifdef _WIN32 // windows

diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
@@ -43,7 +43,6 @@
 #include <string>
 #include <sstream>
 
-using namespace ranges;
 using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::langutil;