From 91e371e533aef7ebe73604bdf1774e8b1517f2cf Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 3 Sep 2010 22:55:29 +0200 Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom --- code/ryzom/client/src/fx_manager.cpp | 2 +- code/ryzom/client/src/login.cpp | 1 - code/ryzom/client/src/seven_zip/7zDecode.cpp | 2 +- code/ryzom/common/src/game_share/stdpch.h | 2 + .../server/src/ai_service/ai_instance.cpp | 2 +- .../src/pd_support_service/daily_commands.cpp | 2 +- .../pd_support_service/hourly_commands.cpp | 2 +- .../pd_support_service/stat_char_commands.cpp | 6 +- .../stat_char_filter_factory.cpp | 4 +- .../stat_char_info_extractor_factory.cpp | 4 +- .../stat_char_scan_script.cpp | 2 +- .../stat_character_scan_job.cpp | 2 +- .../stat_file_list_builder_factory.cpp | 4 +- .../src/pd_support_service/stat_globals.cpp | 6 +- .../pd_support_service/stat_job_manager.cpp | 4 +- .../stat_user_file_list_builders.cpp | 4 +- .../ryzom_naming_service.cpp | 2 +- code/ryzom/tools/assoc_mem/cond_node.h | 1 + code/ryzom/tools/assoc_mem/record.cpp | 2 +- code/ryzom/tools/assoc_mem/tree.cpp | 10 ++-- .../ryzom/tools/leveldesign/export/export.cpp | 3 +- .../tools/make_alias_file/make_alias_file.cpp | 8 +-- .../tools/make_anim_melee_impact/main.cpp | 8 +-- code/ryzom/tools/pd_parser/cpp_output.h | 8 +-- code/ryzom/tools/pd_parser/parser.cpp | 6 +- code/ryzom/tools/pd_parser/templatizer.h | 12 ++-- code/ryzom/tools/pd_parser/tokenizer.h | 4 +- .../tools/skill_extractor/skill_extractor.cpp | 56 +++++++++---------- code/ryzom/tools/stats_scan/char_commands.cpp | 2 +- .../tools/stats_scan/char_filter_factory.cpp | 4 +- .../char_info_extractor_factory.cpp | 4 +- .../tools/stats_scan/char_scan_script.cpp | 4 +- code/ryzom/tools/stats_scan/job_manager.cpp | 2 +- 33 files changed, 93 insertions(+), 92 deletions(-) diff --git a/code/ryzom/client/src/fx_manager.cpp b/code/ryzom/client/src/fx_manager.cpp index 2a6ba0adc..cc785197d 100644 --- a/code/ryzom/client/src/fx_manager.cpp +++ b/code/ryzom/client/src/fx_manager.cpp @@ -142,7 +142,7 @@ void CFXManager::update() while (!_DeferredFXByDate.empty()) { - if (T1 < _DeferredFXByDate.begin()->first) break; + if (T1 < (sint64)_DeferredFXByDate.begin()->first) break; const CDeferredFX &fx = _DeferredFXByDate.begin()->second; NL3D::UParticleSystemInstance fxInstance = instantFX(fx.FXName, fx.TimeOut); if (!fxInstance.empty()) diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 971015960..aad1a3a3e 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -1002,7 +1002,6 @@ void initPatchCheck() // In previous code, the following was not set in R2Mode, possible bug ?...let as before anyway ... // store the selected shard for restarting after patch LoginShardId = Shards[ShardSelected].ShardId; - } if (!isBGDownloadEnabled()) diff --git a/code/ryzom/client/src/seven_zip/7zDecode.cpp b/code/ryzom/client/src/seven_zip/7zDecode.cpp index 9dfbe7dc5..b1106550a 100644 --- a/code/ryzom/client/src/seven_zip/7zDecode.cpp +++ b/code/ryzom/client/src/seven_zip/7zDecode.cpp @@ -106,7 +106,7 @@ SZ_RESULT SzDecode(const CFileSize *packSizes, const CFolder *folder, #endif if (LzmaDecodeProperties(&state.Properties, coder->Properties.Items, - coder->Properties.Capacity) != LZMA_RESULT_OK) + (SizeT)coder->Properties.Capacity) != LZMA_RESULT_OK) return SZE_FAIL; state.Probs = (CProb *)allocMain->Alloc(LzmaGetNumProbs(&state.Properties) * sizeof(CProb)); diff --git a/code/ryzom/common/src/game_share/stdpch.h b/code/ryzom/common/src/game_share/stdpch.h index 94a05e8df..736a81afd 100644 --- a/code/ryzom/common/src/game_share/stdpch.h +++ b/code/ryzom/common/src/game_share/stdpch.h @@ -56,6 +56,8 @@ #include #include #include +#include +#include #include #include diff --git a/code/ryzom/server/src/ai_service/ai_instance.cpp b/code/ryzom/server/src/ai_service/ai_instance.cpp index 0fc47128d..ac696b8fb 100644 --- a/code/ryzom/server/src/ai_service/ai_instance.cpp +++ b/code/ryzom/server/src/ai_service/ai_instance.cpp @@ -705,7 +705,7 @@ CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& float angle = 0.f; if (orientation < (NLMISC::Pi * 2.0) && orientation > (-NLMISC::Pi * 2.0)) - angle = orientation; + angle = (float)orientation; else angle = randomAngle(); diff --git a/code/ryzom/server/src/pd_support_service/daily_commands.cpp b/code/ryzom/server/src/pd_support_service/daily_commands.cpp index 2d69027bf..84314723a 100644 --- a/code/ryzom/server/src/pd_support_service/daily_commands.cpp +++ b/code/ryzom/server/src/pd_support_service/daily_commands.cpp @@ -68,7 +68,7 @@ public: // setup the new lastTime and oldJobsRemaining values uint32 oldJobsRemaining= CJobManager::getInstance()->getNumJobs(); - lastTime= startTime; + lastTime= (uint32)startTime; // execute daily tasks NLMISC::CConfigFile::CVar *commandsVar = NLNET::IService::getInstance()->ConfigFile.getVarPtr("DailyCommands"); diff --git a/code/ryzom/server/src/pd_support_service/hourly_commands.cpp b/code/ryzom/server/src/pd_support_service/hourly_commands.cpp index 2aeb64d89..85a255faa 100644 --- a/code/ryzom/server/src/pd_support_service/hourly_commands.cpp +++ b/code/ryzom/server/src/pd_support_service/hourly_commands.cpp @@ -68,7 +68,7 @@ public: // setup the new lastTime and oldJobsRemaining values uint32 oldJobsRemaining= CJobManager::getInstance()->getNumJobs(); - lastTime= startTime; + lastTime= (uint32)startTime; // execute hourly tasks NLMISC::CConfigFile::CVar *commandsVar = NLNET::IService::getInstance()->ConfigFile.getVarPtr("HourlyCommands"); diff --git a/code/ryzom/server/src/pd_support_service/stat_char_commands.cpp b/code/ryzom/server/src/pd_support_service/stat_char_commands.cpp index ffeed6b0b..7d667fedb 100644 --- a/code/ryzom/server/src/pd_support_service/stat_char_commands.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_char_commands.cpp @@ -297,7 +297,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,listCharNames,"display the names of the charact std::vector files; NLMISC::CPath::getPathContent(STAT_GLOBALS::getInputFilePath().c_str(),false,false,true,files); - for (uint32 i=files.size();i--;) + for (uint32 i=(uint32)files.size();i--;) { if (!NLMISC::testWildCard(NLMISC::CFile::getFilename(files[i]),wildcard)) { @@ -913,7 +913,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptTestFilteredFileList,"list the se return false; // generating a new file list - if (args[0]==CSString("generate").left(args[0].size())) + if (args[0]==CSString("generate").left((uint)args[0].size())) { if (TheCharScanScriptFile==NULL) { @@ -948,7 +948,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptTestFilteredFileList,"list the se } // displaying the last generated file list - if (args[0]==CSString("display").left(args[0].size())) + if (args[0]==CSString("display").left((uint)args[0].size())) { nlinfo("Filtered file list for the current job"); fdc.display(&log); diff --git a/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.cpp b/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.cpp index 6902fe6ad..7c5f850fe 100644 --- a/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.cpp @@ -63,7 +63,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log) { std::string s= _Filters[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the filters displaying names and description @@ -75,7 +75,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log) uint32 CCharFilterFactory::getFilterBuilderCount() { - return _Filters.size(); + return (uint32)_Filters.size(); } ICharFilterBuilder* CCharFilterFactory::getFilterBuilder(uint32 idx) diff --git a/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.cpp b/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.cpp index 0ff961def..da481cf03 100644 --- a/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.cpp @@ -63,7 +63,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log) { std::string s= _InfoExtractors[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the infoExtractors displaying names and description @@ -75,7 +75,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log) uint32 CCharInfoExtractorFactory::getInfoExtractorBuilderCount() { - return _InfoExtractors.size(); + return (uint32)_InfoExtractors.size(); } ICharInfoExtractorBuilder* CCharInfoExtractorFactory::getInfoExtractorBuilder(uint32 idx) diff --git a/code/ryzom/server/src/pd_support_service/stat_char_scan_script.cpp b/code/ryzom/server/src/pd_support_service/stat_char_scan_script.cpp index 4468d723c..3faaf5b72 100644 --- a/code/ryzom/server/src/pd_support_service/stat_char_scan_script.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_char_scan_script.cpp @@ -233,7 +233,7 @@ void CCharScanScriptCommandRegistry::displayScriptCommands(NLMISC::CLog* log) { std::string s= _ScriptCommands[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the script commands displaying names and description diff --git a/code/ryzom/server/src/pd_support_service/stat_character_scan_job.cpp b/code/ryzom/server/src/pd_support_service/stat_character_scan_job.cpp index 4b01b8574..9b85fb3b3 100644 --- a/code/ryzom/server/src/pd_support_service/stat_character_scan_job.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_character_scan_job.cpp @@ -293,7 +293,7 @@ bool CCharacterScanJob::runForFile(const std::string& fileName) c.apply(pdr); // iterate over the filters executing their core code - for (uint32 i=_Filters.size();i--;) + for (uint32 i=(uint32)_Filters.size();i--;) { if (!_Filters[i]->evaluate(&c)) return true; diff --git a/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.cpp b/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.cpp index e6e860966..c05576c22 100644 --- a/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.cpp @@ -63,7 +63,7 @@ void CFileListBuilderFactory::displayFileListBuilderList(NLMISC::CLog* log) { std::string s= _FileLists[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the filters displaying names and description @@ -75,7 +75,7 @@ void CFileListBuilderFactory::displayFileListBuilderList(NLMISC::CLog* log) uint32 CFileListBuilderFactory::getFileListBuilderCount() { - return _FileLists.size(); + return (uint32)_FileLists.size(); } IFileListBuilderBuilder* CFileListBuilderFactory::getFileListBuilder(uint32 idx) diff --git a/code/ryzom/server/src/pd_support_service/stat_globals.cpp b/code/ryzom/server/src/pd_support_service/stat_globals.cpp index af1150b0f..a959fb751 100644 --- a/code/ryzom/server/src/pd_support_service/stat_globals.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_globals.cpp @@ -61,19 +61,19 @@ namespace STAT_GLOBALS NLMISC::CSString getInputFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get()); - return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path; + return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; } NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get()); - return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path; + return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; } NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path) { NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get()); - return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path; + return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path; } diff --git a/code/ryzom/server/src/pd_support_service/stat_job_manager.cpp b/code/ryzom/server/src/pd_support_service/stat_job_manager.cpp index 9fa86db46..7720363b1 100644 --- a/code/ryzom/server/src/pd_support_service/stat_job_manager.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_job_manager.cpp @@ -131,7 +131,7 @@ void CJobManager::serviceUpdate() uint32 CJobManager::addJob(NLMISC::CSmartPtr job) { nlassert(job!=NULL); - uint32 id= _Jobs.size(); + uint32 id= (uint32)_Jobs.size(); _UnfinishedJobs.push_back(id); _Jobs.push_back(job); return id; @@ -225,6 +225,6 @@ void CJobManager::displayJob(uint32 jobId,NLMISC::CLog* log) uint32 CJobManager::getNumJobs() const { - return _UnfinishedJobs.size(); + return (uint32)_UnfinishedJobs.size(); } diff --git a/code/ryzom/server/src/pd_support_service/stat_user_file_list_builders.cpp b/code/ryzom/server/src/pd_support_service/stat_user_file_list_builders.cpp index dbab7117e..da411c2ce 100644 --- a/code/ryzom/server/src/pd_support_service/stat_user_file_list_builders.cpp +++ b/code/ryzom/server/src/pd_support_service/stat_user_file_list_builders.cpp @@ -333,7 +333,7 @@ FILE_LIST_BUILDER(FileAge," []") // calculate the timestamp value of midnight today time_t theTime; time(&theTime); - uint32 dateToday= theTime/(24*64*60)*(24*64*60); + uint32 dateToday= (uint32)(theTime/(24*64*60)*(24*64*60)); // calculate the maximum and minimum timestamp values corresponding to the dates that we've been given uint32 minFileTime= (max==~0u)? 0: dateToday-(max*24*60*60); @@ -382,7 +382,7 @@ FILE_LIST_BUILDER(UserMostRecentFileAge," []") // calculate the timestamp value of midnight today time_t theTime; time(&theTime); - uint32 dateToday= theTime/(24*64*60)*(24*64*60); + uint32 dateToday= (uint32)(theTime/(24*64*60)*(24*64*60)); // calculate the maximum and minimum timestamp values corresponding to the dates that we've been given uint32 minFileTime= (max==~0u)? 0: dateToday-(max*24*60*60); diff --git a/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.cpp b/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.cpp index 42287fb87..aa3e79811 100644 --- a/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.cpp +++ b/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.cpp @@ -1131,7 +1131,7 @@ NLMISC_COMMAND (kill, "kill a service and send an unregister broadcast to other NLMISC_DYNVARIABLE(uint32, NbRegisteredServices, "display the number of service that are registered in naming service") { - if (get) *pointer = RegisteredServices.size(); + if (get) *pointer = (uint32)RegisteredServices.size(); } NLMISC_COMMAND( displayServiceInstances, "SIM: Display info on service instances", "" ) diff --git a/code/ryzom/tools/assoc_mem/cond_node.h b/code/ryzom/tools/assoc_mem/cond_node.h index f2c81aa13..385c979c7 100644 --- a/code/ryzom/tools/assoc_mem/cond_node.h +++ b/code/ryzom/tools/assoc_mem/cond_node.h @@ -76,6 +76,7 @@ template bool CEqualNode::propagRecord(CRecord *record) id_node++; it_val++; } + return false; } /* diff --git a/code/ryzom/tools/assoc_mem/record.cpp b/code/ryzom/tools/assoc_mem/record.cpp index 771de370e..08b6d9ac3 100644 --- a/code/ryzom/tools/assoc_mem/record.cpp +++ b/code/ryzom/tools/assoc_mem/record.cpp @@ -68,5 +68,5 @@ const IValue *CRecord::operator[](int index) int CRecord::size() { - return _Values.size(); + return (int)_Values.size(); } \ No newline at end of file diff --git a/code/ryzom/tools/assoc_mem/tree.cpp b/code/ryzom/tools/assoc_mem/tree.cpp index 9faf4f5d2..c706231e1 100644 --- a/code/ryzom/tools/assoc_mem/tree.cpp +++ b/code/ryzom/tools/assoc_mem/tree.cpp @@ -68,7 +68,7 @@ int CTree::getNbRecords(std::vector &records,int key, IValue *value) double CTree::log2(double val) const { - return (log(val) / log(2)); + return (log(val) / log(2.0)); } double CTree::entropy(double a, double b) const @@ -107,8 +107,8 @@ double CTree::entropy(std::vector &p) const double CTree::gain(std::vector &records, int attrib, CField *field) { - int nb_values = field->getPossibleValues().size(); - int nb_records = records.size(); + int nb_values = (int)field->getPossibleValues().size(); + int nb_records = (int)records.size(); CValue bool_true(true); @@ -270,7 +270,7 @@ INode *CTree::ID3(std::vector &attributes, std::vector &records, // Tests if all records have the same key value, if so returns a result node with this key value. - int nb_records = records.size(); + int nb_records = (int)records.size(); int nb_key_true; int nb_key_false; @@ -380,7 +380,7 @@ void CTree::splitRecords( std::vector &records, int attrib, std::vect { if ( result.size() < fields[attrib]->getPossibleValues().size() ) { - int nb_missing = fields[attrib]->getPossibleValues().size() - result.size(); + int nb_missing = (int)(fields[attrib]->getPossibleValues().size() - result.size()); for (int i = 0; i <= nb_missing; i++ ) { result.push_back( std::vector() ); diff --git a/code/ryzom/tools/leveldesign/export/export.cpp b/code/ryzom/tools/leveldesign/export/export.cpp index fb87b11d5..e2dae2bea 100644 --- a/code/ryzom/tools/leveldesign/export/export.cpp +++ b/code/ryzom/tools/leveldesign/export/export.cpp @@ -18,9 +18,8 @@ #include "formFlora.h" #include "formPlant.h" #ifdef NL_OS_WINDOWS +#define NOMINMAX #include -#undef max -#undef min #endif // NL_OS_WINDOWS #include "nel/ligo/zone_region.h" diff --git a/code/ryzom/tools/make_alias_file/make_alias_file.cpp b/code/ryzom/tools/make_alias_file/make_alias_file.cpp index 1009262c4..0bb4369b2 100644 --- a/code/ryzom/tools/make_alias_file/make_alias_file.cpp +++ b/code/ryzom/tools/make_alias_file/make_alias_file.cpp @@ -65,7 +65,7 @@ public: void readGeorges (const CSmartPtr &form, const CSheetId &sheetId); /// Load/Save the values using the serial system - void serial (IStream &s); + void serial (NLMISC::IStream &s); /** * Event to implement any action when the sheet is no longer existent. @@ -106,7 +106,7 @@ void CSheet::readGeorges (const CSmartPtr &form, const CSheetI // serial // //----------------------------------------------- -void CSheet::serial (IStream &s) +void CSheet::serial (NLMISC::IStream &s) { s.serial( Alias ); } @@ -177,7 +177,7 @@ int main( int argc, char ** argv ) { CConfigFile::CVar& cvSheetPaths = configFile.getVar("SheetPaths"); sint i; - for( i = 0; i< cvSheetPaths.size(); ++i) + for( i = 0; i< (sint)cvSheetPaths.size(); ++i) { sheetPaths.push_back( cvSheetPaths.asString(i) ); } @@ -213,7 +213,7 @@ int main( int argc, char ** argv ) { CConfigFile::CVar& cvExtensions = configFile.getVar("Extensions"); sint i; - for( i = 0; i< cvExtensions.size(); ++i) + for( i = 0; i< (sint)cvExtensions.size(); ++i) { extensions.push_back( cvExtensions.asString(i) ); } diff --git a/code/ryzom/tools/make_anim_melee_impact/main.cpp b/code/ryzom/tools/make_anim_melee_impact/main.cpp index 6b4f6541d..738c5d471 100644 --- a/code/ryzom/tools/make_anim_melee_impact/main.cpp +++ b/code/ryzom/tools/make_anim_melee_impact/main.cpp @@ -147,11 +147,11 @@ void makeAnimMeleeImpact(const std::string &animSetFile, const set::iterator it= currentCombatAnimSet.States.find(key); + set::const_iterator it= currentCombatAnimSet.States.find(key); if(it!=currentCombatAnimSet.States.end()) { // else take the mean anim time @@ -215,7 +215,7 @@ void makeAnimMeleeImpact(const std::string &animSetFile, const setId = logid; - logid += child->Logs.size(); + logid += (uint)child->Logs.size(); child->generateContent(); } @@ -1805,7 +1805,7 @@ void CClassNode::computeAttributesColumns() Attributes = mother->Attributes; } - uint attribId = Attributes.size(); + uint attribId = (uint)Attributes.size(); uint i; for (i=0; i void set(const std::string& name, const T& value) { - uint dotpos = name.find(EnvSeparator); + std::string::size_type dotpos = name.find(EnvSeparator); std::string child = name.substr(0, dotpos); if (dotpos == std::string::npos) @@ -98,7 +98,7 @@ public: /// Does Sub Environment exist? virtual bool envExists(const std::string& name) const { - uint dotpos = name.find(EnvSeparator); + std::string::size_type dotpos = name.find(EnvSeparator); std::string child = name.substr(0, dotpos); if (child.empty()) @@ -114,7 +114,7 @@ public: /// Enter Sub Env, like getEnv() but it doesn't look in parent, and always goes in current env virtual CTemplatizerEnv* getSubEnv(const std::string& name) { - uint dotpos = name.find(EnvSeparator); + std::string::size_type dotpos = name.find(EnvSeparator); std::string child = name.substr(0, dotpos); if (child.empty()) @@ -155,7 +155,7 @@ public: /// Get Sub Env virtual CTemplatizerEnv* getEnv(const std::string& name) { - uint dotpos = name.find(EnvSeparator); + std::string::size_type dotpos = name.find(EnvSeparator); std::string child = name.substr(0, dotpos); if (child.empty()) @@ -265,7 +265,7 @@ public: /// Get Value Node virtual bool getValueNodeAndEnv(const std::string& name, ITemplatizerBloc*& node, CTemplatizerEnv*& env) { - uint pos = name.find_last_of(EnvSeparator); + std::string::size_type pos = name.find_last_of(EnvSeparator); if (pos == std::string::npos) { node = getNode(name); @@ -434,7 +434,7 @@ public: if (RootEnv == NULL) return; - uint pos = var.find_last_of(EnvSeparator); + std::string::size_type pos = var.find_last_of(EnvSeparator); if (pos == std::string::npos) { diff --git a/code/ryzom/tools/pd_parser/tokenizer.h b/code/ryzom/tools/pd_parser/tokenizer.h index 673ff59f7..f71c8704a 100644 --- a/code/ryzom/tools/pd_parser/tokenizer.h +++ b/code/ryzom/tools/pd_parser/tokenizer.h @@ -162,7 +162,7 @@ public: /// Init void init(const char* text, uint size = 0) { - _Size = (size > 0 ? size : strlen(text)); + _Size = (size > 0 ? size : (uint)strlen(text)); _Buffer = text; nlassert(_Buffer != NULL); _TempToken.Start = 0; @@ -301,7 +301,7 @@ public: std::string str(_Buffer+token.Start, token.End-token.Start); if (token.Token == TokenString) { - uint pos = 0; + std::string::size_type pos = 0; while ((pos = str.find('\\', pos)) != std::string::npos) { if (pos+1 == str.size()) diff --git a/code/ryzom/tools/skill_extractor/skill_extractor.cpp b/code/ryzom/tools/skill_extractor/skill_extractor.cpp index aa5ea1db1..fa03d37c7 100644 --- a/code/ryzom/tools/skill_extractor/skill_extractor.cpp +++ b/code/ryzom/tools/skill_extractor/skill_extractor.cpp @@ -33,7 +33,7 @@ using namespace NLMISC; #define outLine( s )\ {\ out = string(s);\ - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() );\ + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() );\ }\ @@ -135,15 +135,15 @@ struct CSkill */ string out; out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); if (ParentSkillPtr != NULL) { @@ -153,22 +153,22 @@ struct CSkill { out = string(" \n"); } - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); if( !Children.empty()) { out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); for (uint i = 0 ; i < Children.size() ; ++i) { out = string(" NormalizedSkillName + string("\" Value=\"")+ Children[i]->SkillName + string("\"/>\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); } out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); } out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); for (uint i = 0 ; i < Children.size() ; ++i) Children[i]->writeInSheet(fo); @@ -383,13 +383,13 @@ sint main( sint argc, char ** argv ) } string out("\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string("
\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); for ( vector::const_iterator itTree = SkillTree.RootSkills.begin() ; itTree != SkillTree.RootSkills.end() ; ++itTree) { @@ -397,11 +397,11 @@ sint main( sint argc, char ** argv ) } out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string("
\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); fo.close(); // create the code .typ @@ -412,19 +412,19 @@ sint main( sint argc, char ** argv ) } out = string("\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); set::const_iterator itCode; for ( itCode = Codes.begin() ; itCode != Codes.end() ; ++itCode ) { out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); } out = string("\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); fo.close(); } @@ -460,18 +460,18 @@ sint main( sint argc, char ** argv ) // output header of .typ or .dfn file string out("\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); if( string( argv[2] ).find(".typ") != string::npos ) { out = string("\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); out = string(" \n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); } else { out = string("\n"); - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); } // parse all skills to export selected ones @@ -522,7 +522,7 @@ sint main( sint argc, char ** argv ) { out = string(" \n"); } - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); } } @@ -534,7 +534,7 @@ sint main( sint argc, char ** argv ) { out = string("\n"); } - fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), out.size() ); + fo.serialBuffer( (uint8 *) const_cast< char * >(out.c_str()), (uint)out.size() ); fo.close(); ///////////////////////////////////////////////////////////////////////////////////// diff --git a/code/ryzom/tools/stats_scan/char_commands.cpp b/code/ryzom/tools/stats_scan/char_commands.cpp index b26ff7878..4506536af 100644 --- a/code/ryzom/tools/stats_scan/char_commands.cpp +++ b/code/ryzom/tools/stats_scan/char_commands.cpp @@ -129,7 +129,7 @@ NLMISC_COMMAND(listCharNames,"display the names of the characters int he listed std::vector files; NLMISC::CPath::getPathContent(SourceDirectory.get().c_str(),false,false,true,files); - for (uint32 i=files.size();i--;) + for (uint32 i=(uint32)files.size();i--;) { if (!NLMISC::testWildCard(NLMISC::CFile::getFilename(files[i]),wildcard)) { diff --git a/code/ryzom/tools/stats_scan/char_filter_factory.cpp b/code/ryzom/tools/stats_scan/char_filter_factory.cpp index 2b9cefb32..adeab857f 100644 --- a/code/ryzom/tools/stats_scan/char_filter_factory.cpp +++ b/code/ryzom/tools/stats_scan/char_filter_factory.cpp @@ -63,7 +63,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log) { std::string s= _Filters[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the filters displaying names and description @@ -75,7 +75,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log) uint32 CCharFilterFactory::getFilterBuilderCount() { - return _Filters.size(); + return (uint32)_Filters.size(); } ICharFilterBuilder* CCharFilterFactory::getFilterBuilder(uint32 idx) diff --git a/code/ryzom/tools/stats_scan/char_info_extractor_factory.cpp b/code/ryzom/tools/stats_scan/char_info_extractor_factory.cpp index 2a75806c6..6e99c3d1f 100644 --- a/code/ryzom/tools/stats_scan/char_info_extractor_factory.cpp +++ b/code/ryzom/tools/stats_scan/char_info_extractor_factory.cpp @@ -63,7 +63,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log) { std::string s= _InfoExtractors[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the infoExtractors displaying names and description @@ -75,7 +75,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log) uint32 CCharInfoExtractorFactory::getInfoExtractorBuilderCount() { - return _InfoExtractors.size(); + return (uint32)_InfoExtractors.size(); } ICharInfoExtractorBuilder* CCharInfoExtractorFactory::getInfoExtractorBuilder(uint32 idx) diff --git a/code/ryzom/tools/stats_scan/char_scan_script.cpp b/code/ryzom/tools/stats_scan/char_scan_script.cpp index dd9269109..99fee67cf 100644 --- a/code/ryzom/tools/stats_scan/char_scan_script.cpp +++ b/code/ryzom/tools/stats_scan/char_scan_script.cpp @@ -73,7 +73,7 @@ bool CCharScanScript::addScriptFile(const std::string& fileName) void CCharScanScript::applyToJob(CCharacterScanJob& job) { // iterate backwards over the script files in order to apply the most important files last - for (uint32 i=_ScriptFiles.size();i--;) + for (uint32 i=(uint32)_ScriptFiles.size();i--;) { _ScriptFiles[i].applyToJob(job); } @@ -230,7 +230,7 @@ void CCharScanScriptCommandRegistry::displayScriptCommands(NLMISC::CLog* log) { std::string s= _ScriptCommands[i]->getName(); if (s.size()>longestName) - longestName=s.size(); + longestName=(uint32)s.size(); } // iterate over the script commands displaying names and description diff --git a/code/ryzom/tools/stats_scan/job_manager.cpp b/code/ryzom/tools/stats_scan/job_manager.cpp index 9f2c89997..f1fa8bf91 100644 --- a/code/ryzom/tools/stats_scan/job_manager.cpp +++ b/code/ryzom/tools/stats_scan/job_manager.cpp @@ -86,7 +86,7 @@ void CJobManager::serviceUpdate() uint32 CJobManager::addJob(NLMISC::CSmartPtr job) { nlassert(job!=NULL); - uint32 id= _Jobs.size(); + uint32 id= (uint32)_Jobs.size(); _UnfinishedJobs.push_back(id); _Jobs.push_back(job); return id;