Skip to content
Snippets Groups Projects
Commit d1290b1d authored by Xavier ELATTAOUI's avatar Xavier ELATTAOUI
Browse files

Minor change in StringTokenizer cpp file

parent 03033fa4
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId>
<artifactId>XPSV2-${aol}-${mode}</artifactId>
<version>1.4.12-SNAPSHOT</version>
<version>1.4.12</version>
<packaging>nar</packaging>
......
......@@ -5,16 +5,14 @@
// cette classe offre 1 service de réduction d'1 chaine avec séparateurs en tokens
//
//////////////////////////////////////////////////////////////////////
#include "StringTokenizer.h"
//- Ctor with initialisation---------------------------------------------
StringTokenizer::StringTokenizer(const std::string _delim,
const std::string & _str_in) :
delimiters(_delim)
{
this->tokenize(_str_in);
tokenize(_str_in);
}
//- Ctor without initialisation------------------------------------------
......@@ -37,12 +35,11 @@ void StringTokenizer::tokenize(const std::string & str_in)
std::string::size_type beg, end;
try
{
if(token.size() > 0)
token.clear();
beg = str_in.find_first_not_of(this->delimiters);
end = str_in.find_first_of(this->delimiters, beg);
beg = str_in.find_first_not_of(delimiters);
end = str_in.find_first_of(delimiters, beg);
while (beg != std::string::npos)
{
......@@ -50,14 +47,14 @@ void StringTokenizer::tokenize(const std::string & str_in)
beg = end;
if(beg == std::string::npos)
break;
end = str_in.find_first_of( this->delimiters, ++beg);
end = str_in.find_first_of(delimiters, ++beg);
}
}
catch (...)
{
THROW_DEVFAILED(_CPTC("SOFTWARE_ERROR"),
_CPTC("error trying to tokenize"),
_CPTC("StringTokenizer::tokenize"));
THROW_DEVFAILED("SOFTWARE_ERROR",
"error trying to tokenize",
"StringTokenizer::tokenize");
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment