summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2008-03-12 13:23:32 +0800
committerMatthew Newhook <matthew@zeroc.com>2008-03-12 13:23:32 +0800
commit3d9e6183821ada7c3ed3edb786e9d4ea996970dd (patch)
tree277a6ddf53a6e5ff6d9145915e24cd1af42c33b1 /cpp
parentmerge of bug2737. (diff)
downloadice-3d9e6183821ada7c3ed3edb786e9d4ea996970dd.tar.bz2
ice-3d9e6183821ada7c3ed3edb786e9d4ea996970dd.tar.xz
ice-3d9e6183821ada7c3ed3edb786e9d4ea996970dd.zip
Added Freeze/Catalog.h to include/Freeze.h
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/Freeze/Freeze.h1
-rw-r--r--cpp/src/IceStorm/Migrate.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h
index cfbb8bcb492..0eaec3375ad 100644
--- a/cpp/include/Freeze/Freeze.h
+++ b/cpp/include/Freeze/Freeze.h
@@ -15,5 +15,6 @@
#include <Freeze/TransactionalEvictor.h>
#include <Freeze/Map.h>
#include <Freeze/TransactionHolder.h>
+#include <Freeze/Catalog.h>
#endif
diff --git a/cpp/src/IceStorm/Migrate.cpp b/cpp/src/IceStorm/Migrate.cpp
index 4ffa27a82e5..e99e36e6eeb 100644
--- a/cpp/src/IceStorm/Migrate.cpp
+++ b/cpp/src/IceStorm/Migrate.cpp
@@ -9,7 +9,6 @@
#include <IceUtil/DisableWarnings.h>
#include <Freeze/Freeze.h>
-#include <Freeze/Catalog.h> // XXX:
#include <IceStorm/SubscriberMap.h>
#include <IceStorm/IceStormInternal.h>