From 363bf42b955c48b09c35fc61db3dac4b1e81de9d Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Mon, 21 Oct 2013 12:00:52 +0200 Subject: [PATCH] reinstate previous regex --- Util/ProgramOptions.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h index 02dbff5ef..ee7d78a7a 100644 --- a/Util/ProgramOptions.h +++ b/Util/ProgramOptions.h @@ -76,22 +76,14 @@ inline void PrepareConfigFile( const boost::filesystem::path& path, std::string& output ) { - BOOST_ASSERT_MSG( output.empty(), "output string not empty"); std::ifstream config_stream( path.string().c_str() ); - std::string input_string( + std::string input_str( (std::istreambuf_iterator(config_stream)), std::istreambuf_iterator() ); boost::regex regex( "^([^=]*)" ); //match from start of line to '=' std::string format( "\\L$1\\E" ); //replace with downcased substring - - boost::regex_replace( - output.begin(), - input_string.begin(), - input_string.end(), - regex, - format - ); + output = boost::regex_replace( input_str, regex, format ); }