summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBret Curtis <psi29a@gmail.com>2023-04-23 14:26:46 +0200
committerBret Curtis <psi29a@gmail.com>2023-04-23 14:26:46 +0200
commit87221330a24be6c0c7ce9ec46e49a631ea834d98 (patch)
tree530c20f2f58179dfc44a55625a2e0705e340f628
parentebf6f50523eb492e03148f1539955b02abf967ea (diff)
give some std:: a chance to shineboost_removal
-rw-r--r--apps/openmw_test_suite/nifosg/testnifloader.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/openmw_test_suite/nifosg/testnifloader.cpp b/apps/openmw_test_suite/nifosg/testnifloader.cpp
index 3c13cb1f79..ed6783ada7 100644
--- a/apps/openmw_test_suite/nifosg/testnifloader.cpp
+++ b/apps/openmw_test_suite/nifosg/testnifloader.cpp
@@ -10,9 +10,6 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/format.hpp>
-
#include <osgDB/Registry>
#include <array>
@@ -55,7 +52,7 @@ namespace
{
if (line.starts_with('#'))
continue;
- boost::trim_right(line);
+ line.erase(line.find_last_not_of(" \t\n\r\f\v") + 1);
result += line;
result += '\n';
}
@@ -163,7 +160,7 @@ osg::Group {
}
}
)";
- return (boost::format(format) % shaderPrefix).str();
+ return (std::ostringstream() << std::string(format) << shaderPrefix).str();
}
struct ShaderPrefixParams