From cf45f3ef91eff8dc9c79978c054fa2f54bec1d9b Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 9 May 2010 14:30:23 +0200 Subject: [PATCH] Changed: #853 Compilation on 64-bits platforms --- .../increment_version/increment_version.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/tool/increment_version/increment_version.cpp b/code/tool/increment_version/increment_version.cpp index 27220acc6..1f90023f4 100644 --- a/code/tool/increment_version/increment_version.cpp +++ b/code/tool/increment_version/increment_version.cpp @@ -14,9 +14,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include "nel/misc/types_nl.h" -#include "nel/misc/debug.h" -#include "nel/misc/file.h" +#include +#include +#include #include @@ -68,10 +68,10 @@ sint main( sint argc, char ** argv ) getline(input,line,'\n'); // search the version motif - sint32 idx = line.find(argv[2]); + string::size_type idx = line.find(argv[2]); // if motif not found - if( idx == -1 ) + if( idx == string::npos ) { // we write the line in output and continue to the next line fprintf(output,"%s\n",line.c_str()); @@ -83,7 +83,7 @@ sint main( sint argc, char ** argv ) // search the main version number idx = line.find(argv[3]); - if( idx == -1 ) + if( idx == string::npos ) { fprintf(output,"%s\n",line.c_str()); continue; @@ -92,9 +92,9 @@ sint main( sint argc, char ** argv ) versionNumberFound = true; // get old build version number - sint32 oldBuildVersionStartIdx = line.rfind(".") + 1; - sint32 oldBuildVersionEndIdx = line.find_first_of(" \"\t",oldBuildVersionStartIdx) - 1; - if( oldBuildVersionEndIdx == -1) + string::size_type oldBuildVersionStartIdx = line.rfind(".") + 1; + string::size_type oldBuildVersionEndIdx = line.find_first_of(" \"\t",oldBuildVersionStartIdx) - 1; + if( oldBuildVersionEndIdx == string::npos) { oldBuildVersionEndIdx = line.size() - 1; }