Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
This commit is contained in:
commit
8b29f9dee0
2 changed files with 8 additions and 1 deletions
|
|
@ -19,6 +19,7 @@ namespace fc
|
||||||
typedef fc::optional<fc::string> ostring;
|
typedef fc::optional<fc::string> ostring;
|
||||||
class variant_object;
|
class variant_object;
|
||||||
fc::string format_string( const fc::string&, const variant_object& );
|
fc::string format_string( const fc::string&, const variant_object& );
|
||||||
|
fc::string trim( const fc::string& );
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
#include <fc/utility.hpp>
|
#include <fc/utility.hpp>
|
||||||
#include <fc/fwd_impl.hpp>
|
#include <fc/fwd_impl.hpp>
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
|
#include <boost/algorithm/string.hpp>
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
|
@ -97,7 +98,12 @@ namespace fc {
|
||||||
{
|
{
|
||||||
return boost::lexical_cast<std::string>(d);
|
return boost::lexical_cast<std::string>(d);
|
||||||
}
|
}
|
||||||
|
std::string trim( const std::string& s )
|
||||||
|
{
|
||||||
|
std::string cpy(s);
|
||||||
|
boost::algorithm::trim(cpy);
|
||||||
|
return cpy;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace fc
|
} // namespace fc
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue