diff options
| author | Jose <jose@zeroc.com> | 2016-03-15 10:14:53 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-15 10:14:53 +0100 |
| commit | a211fe1bbcb8e160136f3dd22b516ba751d4b02e (patch) | |
| tree | 3373d05751d651092ee74cb23b7bf4bc17b848b6 /cpp/src/IceStorm | |
| parent | .gitignore updates (diff) | |
| download | ice-a211fe1bbcb8e160136f3dd22b516ba751d4b02e.tar.bz2 ice-a211fe1bbcb8e160136f3dd22b516ba751d4b02e.tar.xz ice-a211fe1bbcb8e160136f3dd22b516ba751d4b02e.zip | |
ICE-7019 - remove db tools dependency on IcePatch2
Diffstat (limited to 'cpp/src/IceStorm')
| -rw-r--r-- | cpp/src/IceStorm/IceStormDB.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Makefile | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/IceStorm/IceStormDB.cpp b/cpp/src/IceStorm/IceStormDB.cpp index 76b1aa04244..0777c842272 100644 --- a/cpp/src/IceStorm/IceStormDB.cpp +++ b/cpp/src/IceStorm/IceStormDB.cpp @@ -12,7 +12,6 @@ #include <IceUtil/FileUtil.h> #include <Ice/Application.h> #include <Freeze/Freeze.h> -#include <IcePatch2Lib/Util.h> #include <DBTypes.h> #include <LLUMap.h> #include <SubscriberMap.h> @@ -141,8 +140,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; diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 203726eda15..83b770860f6 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -105,7 +105,7 @@ $(ADMIN): $(AOBJS) $(LIBTARGETS) $(DB): $(DOBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DOBJS) -lIceStorm -lIcePatch2 -lFreeze $(LIBS) + $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(DOBJS) -lIceStorm -lFreeze $(LIBS) $(MIGRATE): $(MOBJS) rm -f $@ |