@ -14,9 +14,6 @@
# include <util/strencodings.h>
# include <util/strencodings.h>
# include <version.h>
# include <version.h>
# include <boost/algorithm/string/classification.hpp>
# include <boost/algorithm/string/split.hpp>
# include <algorithm>
# include <algorithm>
# include <string>
# include <string>
@ -66,12 +63,11 @@ CScript ParseScript(const std::string& s)
{
{
CScript result ;
CScript result ;
std : : vector < std : : string > words ;
std : : vector < std : : string > words = SplitString ( s , " \t \n " ) ;
boost : : algorithm : : split ( words , s , boost : : algorithm : : is_any_of ( " \t \n " ) , boost : : algorithm : : token_compress_on ) ;
for ( const std : : string & w : words ) {
for ( const std : : string & w : words ) {
if ( w . empty ( ) ) {
if ( w . empty ( ) ) {
// Empty string, ignore. ( boost::split given '' will return one word )
// Empty string, ignore. ( SplitString doesn't combine multiple separators )
} else if ( std : : all_of ( w . begin ( ) , w . end ( ) , : : IsDigit ) | |
} else if ( std : : all_of ( w . begin ( ) , w . end ( ) , : : IsDigit ) | |
( w . front ( ) = = ' - ' & & w . size ( ) > 1 & & std : : all_of ( w . begin ( ) + 1 , w . end ( ) , : : IsDigit ) ) )
( w . front ( ) = = ' - ' & & w . size ( ) > 1 & & std : : all_of ( w . begin ( ) + 1 , w . end ( ) , : : IsDigit ) ) )
{
{