From 08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001 From: Torsten Paul Date: Wed, 2 Feb 2022 00:50:43 +0100 Subject: [PATCH] Fix build issue with overloaded join(). --- src/openscad.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/openscad.cc b/src/openscad.cc index a6f648d2a2..3c46cda2af 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include @@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string color_scheme, const bool exit_if_ } if (exit_if_not_found) { - LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n"))); + LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n"))); exit(1); } else { @@ -885,7 +884,7 @@ struct CommaSeparatedVector }; template -std::string join(const Seq &seq, const std::string &sep, const ToString &toString) +std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString) { return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep); } @@ -947,7 +946,7 @@ int main(int argc, char **argv) ("P,P", po::value(), "customizer parameter set") #ifdef ENABLE_EXPERIMENTAL ("enable", po::value>(), ("enable experimental features: " + - join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ", + str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ", [](const Feature *feature) { return feature->get_name(); }) + @@ -964,11 +963,11 @@ int main(int argc, char **argv) ("render", po::value()->implicit_value(""), "for full geometry evaluation when exporting png") ("preview", po::value()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png") ("animate", po::value(), "export N animated frames") - ("view", po::value(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str()) + ("view", po::value(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str()) ("projection", po::value(), "=(o)rtho or (p)erspective when exporting png") ("csglimit", po::value(), "=n -stop rendering at n CSG elements when exporting png") ("colorscheme", po::value(), ("=colorscheme: " + - join(ColorMap::inst()->colorSchemeNames(), " | ", + str_join(ColorMap::inst()->colorSchemeNames(), " | ", [](const std::string& colorScheme) { return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme; }) +