From 9fcb18553ad25829e67c6c854fa499bff9bbdcfb Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sat, 8 Jun 2013 20:03:29 +0000 Subject: [PATCH] Fixed crash with Windows compile. Renamed method "RsFiles::CopyFile" to "RsFiles::copyFile" (lower case) to avoid renaming of "CopyFile" to "CopyFileW" with the newly included "windows.h". From windows.h #define CopyFile CopyFileW git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6415 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/ft/ftserver.cc | 2 +- libretroshare/src/ft/ftserver.h | 2 +- libretroshare/src/retroshare/rsfiles.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc index 864d9c52f..8c802d5e6 100644 --- a/libretroshare/src/ft/ftserver.cc +++ b/libretroshare/src/ft/ftserver.cc @@ -692,7 +692,7 @@ bool ftServer::InDirectoryCheck() return mFiMon->inDirectoryCheck(); } -bool ftServer::CopyFile(const std::string& source, const std::string& dest) +bool ftServer::copyFile(const std::string& source, const std::string& dest) { return mFtController->copyFile(source, dest); } diff --git a/libretroshare/src/ft/ftserver.h b/libretroshare/src/ft/ftserver.h index 32a881b27..20e1b48ed 100644 --- a/libretroshare/src/ft/ftserver.h +++ b/libretroshare/src/ft/ftserver.h @@ -200,7 +200,7 @@ class ftServer: public RsFiles, public ftDataSend, public RsTurtleClientService, virtual void ForceDirectoryCheck(); virtual void updateSinceGroupPermissionsChanged() ; virtual bool InDirectoryCheck(); - virtual bool CopyFile(const std::string& source, const std::string& dest); + virtual bool copyFile(const std::string& source, const std::string& dest); /*** * Directory Handling diff --git a/libretroshare/src/retroshare/rsfiles.h b/libretroshare/src/retroshare/rsfiles.h index 418f407fe..fbde51b61 100644 --- a/libretroshare/src/retroshare/rsfiles.h +++ b/libretroshare/src/retroshare/rsfiles.h @@ -188,7 +188,7 @@ class RsFiles virtual void ForceDirectoryCheck() = 0; virtual void updateSinceGroupPermissionsChanged() = 0; virtual bool InDirectoryCheck() = 0; - virtual bool CopyFile(const std::string& source,const std::string& dest) = 0; + virtual bool copyFile(const std::string& source,const std::string& dest) = 0; /*** * Directory Control