diff options
Diffstat (limited to 'cpp/src/IceGrid')
-rw-r--r-- | cpp/src/IceGrid/.gitignore | 8 | ||||
-rw-r--r-- | cpp/src/IceGrid/IceGridDB.cpp | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/.gitignore b/cpp/src/IceGrid/.gitignore index 41d881d4e8a..0115ebcad98 100644 --- a/cpp/src/IceGrid/.gitignore +++ b/cpp/src/IceGrid/.gitignore @@ -1,11 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! -DBTypes.cpp -DBTypes.h -IceLocatorDiscovery.cpp -IceLocatorDiscovery.h +.depend +.depend Internal.cpp +IceLocatorDiscovery.cpp +DBTypes.cpp Internal.h DBTypes.h DBTypes.cpp diff --git a/cpp/src/IceGrid/IceGridDB.cpp b/cpp/src/IceGrid/IceGridDB.cpp index 8eb7cb0e629..f6d4317df5b 100644 --- a/cpp/src/IceGrid/IceGridDB.cpp +++ b/cpp/src/IceGrid/IceGridDB.cpp @@ -251,8 +251,7 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - StringSeq files = IcePatch2Internal::readDirectory(dbPath); - if(!files.empty()) + if(!IceUtilInternal::isEmptyDirectory(dbPath)) { cerr << argv[0] << ": output directory is not empty: " << dbPath << endl; return EXIT_FAILURE; |