diff options
| author | Michi Henning <michi@zeroc.com> | 2008-07-08 17:15:16 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2008-07-08 17:15:16 +1000 |
| commit | c49d9f97620053b30ecdfa66581484030865d039 (patch) | |
| tree | 18803c9334660fad1a069fb8d1a01fe58f202512 /cpp/src/slice2cpp | |
| parent | Bug 2038 - Fixed stale comment from previous fix. (diff) | |
| download | ice-c49d9f97620053b30ecdfa66581484030865d039.tar.bz2 ice-c49d9f97620053b30ecdfa66581484030865d039.tar.xz ice-c49d9f97620053b30ecdfa66581484030865d039.zip | |
Squashed commit of the following:
commit 3677312fda0e2e230d5572b3e76b3d1758c86919
Author: Michi Henning <michi@zeroc.com>
Date: Tue Jul 8 17:08:15 2008 +1000
Bug 2038 - Ctrl-C on Windows without CtrlCHandler
Renamed FactoryTableDef -> FactoryTable
Renamed FactoryTable -> FactoryTableInit
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/.depend | 4 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2cpp/.depend b/cpp/src/slice2cpp/.depend index e17f5043684..89088500c5e 100644 --- a/cpp/src/slice2cpp/.depend +++ b/cpp/src/slice2cpp/.depend @@ -1,2 +1,2 @@ -Gen$(OBJEXT): Gen.cpp ./Gen.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/CPlusPlusUtil.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Iterator.h $(includedir)/Slice/Checksum.h $(includedir)/Slice/SignalHandler.h -Main$(OBJEXT): Main.cpp $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Handle.h $(includedir)/Slice/Preprocessor.h $(includedir)/Slice/SignalHandler.h ./Gen.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/OutputUtil.h +Gen$(OBJEXT): Gen.cpp Gen.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/OutputUtil.h $(includedir)/Slice/Util.h $(includedir)/Slice/CPlusPlusUtil.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/Iterator.h $(includedir)/Slice/Checksum.h $(includedir)/Slice/SignalHandler.h +Main$(OBJEXT): Main.cpp $(includedir)/IceUtil/Options.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Handle.h $(includedir)/Slice/Preprocessor.h $(includedir)/Slice/SignalHandler.h Gen.h $(includedir)/Slice/Parser.h $(includedir)/IceUtil/OutputUtil.h diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 77e6d834465..f45b93aaf07 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -257,7 +257,7 @@ Slice::Gen::generate(const UnitPtr& p) if(p->hasDataOnlyClasses() || p->hasNonLocalExceptions()) { - H << "\n#include <Ice/FactoryTable.h>"; + H << "\n#include <Ice/FactoryTableInit.h>"; } if(p->usesNonLocals()) |