give some std:: a chance to shine

boost_removal
Bret Curtis 1 year ago
parent ebf6f50523
commit 87221330a2

@ -10,9 +10,6 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <boost/algorithm/string.hpp>
#include <boost/format.hpp>
#include <osgDB/Registry> #include <osgDB/Registry>
#include <array> #include <array>
@ -55,7 +52,7 @@ namespace
{ {
if (line.starts_with('#')) if (line.starts_with('#'))
continue; continue;
boost::trim_right(line); line.erase(line.find_last_not_of(" \t\n\r\f\v") + 1);
result += line; result += line;
result += '\n'; result += '\n';
} }
@ -163,7 +160,7 @@ osg::Group {
} }
} }
)"; )";
return (boost::format(format) % shaderPrefix).str(); return (std::ostringstream() << std::string(format) << shaderPrefix).str();
} }
struct ShaderPrefixParams struct ShaderPrefixParams

Loading…
Cancel
Save