From 3178cb67085fc24906f25a66eadb7dc6e15ca71a Mon Sep 17 00:00:00 2001 From: sfb Date: Mon, 2 Apr 2012 14:26:12 -0500 Subject: [PATCH] Fixed: #1455 VS10 isn't implicitly casting to CSString. Forcing it, which is probably more correct anyway. --- code/CMakeLists.txt | 2 +- .../general_utilities_service/rfr_ryzom_file_retriever.cpp | 4 +++- .../server/src/patchman_service/pam_patchman_admin_module.cpp | 3 ++- .../server/src/patchman_service/spa_server_patch_applier.cpp | 3 ++- .../server/src/patchman_service/spb_server_patch_bridge.cpp | 3 ++- .../server/src/patchman_service/spt_server_patch_terminal.cpp | 4 +++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index bf5867327..b73545d14 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -257,7 +257,7 @@ IF(WIN32) IF(WITH_TOOLS) SET(CMAKE_INSTALL_MFC_LIBRARIES TRUE) ENDIF(WITH_TOOLS) - INCLUDE(InstallRequiredSystemLibraries) + #INCLUDE(InstallRequiredSystemLibraries) ENDIF(WIN32) INCLUDE(CPack) diff --git a/code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp b/code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp index fa3811dec..6e0f4940f 100644 --- a/code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp +++ b/code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp @@ -472,7 +472,9 @@ bool CRyzomFileRetrieverImplementation::downloadBackupFiles(const CSString& shar continue; // generate a local filename for the downloaded file - CSString localFileName= NLMISC::CPath::standardizePath(localDirectory)+(fileName+"_"+fdc[i].FileName.replace("/","_")).replace(".","_"); + CSString localFileName= NLMISC::CPath::standardizePath(localDirectory)+(fileName+"_"+fdc[i].FileName); + localFileName = localFileName.replace("/","_"); + localFileName = localFileName.replace(".","_"); nlinfo("Requesting file download: REMOTE:%s => LOCAL:%s",fdc[i].FileName.c_str(),localFileName.c_str()); // put in a request for the file to be retrieved diff --git a/code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp b/code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp index 334fabb74..0eaf4f946 100644 --- a/code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp +++ b/code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp @@ -134,7 +134,8 @@ bool CPatchmanAdminModule::initModule(const TParsedCommandLine &initInfo) CDeploymentConfigurationSynchroniser::init(this); // now that the base classes have been initialised, we can cumulate the module manifests - _Manifest= (CFileReceiver::getModuleManifest()+_Manifest).strip(); + _Manifest= (CFileReceiver::getModuleManifest()+_Manifest); + _Manifest = _Manifest.strip(); // we're all done so let the world know registerProgress(string("PAM Initialised: ")+logMsg+" "+_Manifest); diff --git a/code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp b/code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp index 80697cc97..b5b35329c 100644 --- a/code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp +++ b/code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp @@ -385,7 +385,8 @@ bool CServerPatchApplier::initModule(const TParsedCommandLine &initInfo) CDeploymentConfigurationSynchroniser::init(this); // now that the base classes have been initialised, we can cumulate the module manifests - _Manifest= (CFileReceiver::getModuleManifest()+_Manifest).strip(); + _Manifest= (CFileReceiver::getModuleManifest()+_Manifest); + _Manifest = _Manifest.strip(); // we're all done so let the world know registerProgress(string("SPA Initialised: ")+logMsg+" "+_Manifest); diff --git a/code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp b/code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp index e68548086..af07c2fbb 100644 --- a/code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp +++ b/code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp @@ -136,7 +136,8 @@ bool CServerPatchBridge::initModule(const TParsedCommandLine &initInfo) CFileReceiver::init(this,"*/*"); // now that the base classes have been initialised, we can cumulate the module manifests - _Manifest= (CFileRepository::buildModuleManifest()+" "+CFileReceiver::getModuleManifest()+" "+_Manifest).strip(); + _Manifest= (CFileRepository::buildModuleManifest()+" "+CFileReceiver::getModuleManifest()+" "+_Manifest); + _Manifest = _Manifest.strip(); // scan our local file cache to buildup our starting file base setStateVariable("State","Scanning"); diff --git a/code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp b/code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp index 3b649835a..f5f676989 100644 --- a/code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp +++ b/code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp @@ -81,7 +81,9 @@ static void addSPTMessage(const CSString& moduleName, const CSString& msgText) nldebug("SPTMSG_VERBOSE %d: %s: %s",count,moduleName.c_str(),msgText.c_str()); // look for a slot to stick the message in - CSString cleanModuleName= (moduleName.splitTo(':')+'/'+moduleName.splitFrom(':').splitFrom(':')).strip(); + CSString cleanModuleName= (moduleName.splitTo(':')+'/'+moduleName.splitFrom(':').splitFrom(':')); + cleanModuleName = cleanModuleName.strip(); + uint32 oldest=0; uint32 oldestTime=~0u; for (uint32 i=0;i