Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
@@ -78,7 +78,7 @@ bool WinMoveFile( RString sOldPath, RString sNewPath )
|
||||
bool CreateDirectories( RString Path )
|
||||
{
|
||||
// XXX: handle "//foo/bar" paths in Windows
|
||||
vector<RString> parts;
|
||||
std::vector<RString> parts;
|
||||
RString curpath;
|
||||
|
||||
// If Path is absolute, add the initial slash ("ignore empty" will remove it).
|
||||
@@ -303,8 +303,8 @@ void DirectFilenameDB::PopulateFileSet( FileSet &fs, const RString &path )
|
||||
*/
|
||||
static const RString IGNORE_MARKER_BEGINNING = "ignore-";
|
||||
|
||||
vector<RString> vsFilesToRemove;
|
||||
for( set<File>::iterator iter = fs.files.lower_bound(IGNORE_MARKER_BEGINNING);
|
||||
std::vector<RString> vsFilesToRemove;
|
||||
for( std::set<File>::iterator iter = fs.files.lower_bound(IGNORE_MARKER_BEGINNING);
|
||||
iter != fs.files.end();
|
||||
++iter )
|
||||
{
|
||||
@@ -320,7 +320,7 @@ void DirectFilenameDB::PopulateFileSet( FileSet &fs, const RString &path )
|
||||
// Erase the file corresponding to the ignore marker
|
||||
File fileToDelete;
|
||||
fileToDelete.SetName( iter );
|
||||
set<File>::iterator iter2 = fs.files.find( fileToDelete );
|
||||
std::set<File>::iterator iter2 = fs.files.find( fileToDelete );
|
||||
if( iter2 != fs.files.end() )
|
||||
fs.files.erase( iter2 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user