diff options
| author | Joe George <joe@zeroc.com> | 2016-03-17 11:44:37 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-03-17 11:44:37 -0400 |
| commit | db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2 (patch) | |
| tree | 3c05d7f841a1585360d0a6450748fd6dc26b050c /cpp/src/IceGrid/IceGridDB.cpp | |
| parent | fixing .gitignore in checksum test (diff) | |
| parent | Update Ice Builder for Gradle version to 1.2.1 (diff) | |
| download | ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.bz2 ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.xz ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IceGrid/IceGridDB.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridDB.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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; |