Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 07:29:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crash with Windows compile.

Browse Source 
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
This commit is contained in:
thunder2 2013-06-08 20:03:29 +00:00
parent f22972d0f4
commit 9fcb18553a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/ft/ftserver.cc
View File

@ -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);
}

2
libretroshare/src/ft/ftserver.h
View File

@ -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

2
libretroshare/src/retroshare/rsfiles.h
View File

@ -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