diff options
| author | ZeroC Staff <git@zeroc.com> | 2007-12-14 14:39:49 -0500 |
|---|---|---|
| committer | ZeroC Staff <git@zeroc.com> | 2007-12-14 14:39:49 -0500 |
| commit | 9c66a24cd66a241cb414413c66f5cc1debd13f88 (patch) | |
| tree | e561b21ee4e1bb714479b34f8af0a8567cc7d32c /cpp | |
| parent | Fixed vc60 msi build (diff) | |
| parent | Fixed Windows build (diff) | |
| download | ice-9c66a24cd66a241cb414413c66f5cc1debd13f88.tar.bz2 ice-9c66a24cd66a241cb414413c66f5cc1debd13f88.tar.xz ice-9c66a24cd66a241cb414413c66f5cc1debd13f88.zip | |
Merge branch 'master' of bernard@cvs.zeroc.com:/home/git/ice
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/src/Slice/CsUtil.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Freeze/evictor/.gitignore | 1 | ||||
| -rw-r--r-- | cpp/test/Freeze/evictor/Makefile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 9b9c7c801c2..82c2281b0da 100755 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -174,7 +174,7 @@ Slice::CsGenerator::typeToString(const TypePtr& type) "string", "Ice.Object", "Ice.ObjectPrx", - "System.Object" + "_System.Object" }; BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); diff --git a/cpp/test/Freeze/evictor/.gitignore b/cpp/test/Freeze/evictor/.gitignore index ef79d3f766b..2ab27ddce01 100644 --- a/cpp/test/Freeze/evictor/.gitignore +++ b/cpp/test/Freeze/evictor/.gitignore @@ -6,5 +6,6 @@ server Test.cpp Test.h db/__catalog +db/__catalogIndexList db/Test db/log.* diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile index 57c255be47b..46d4544b63d 100644 --- a/cpp/test/Freeze/evictor/Makefile +++ b/cpp/test/Freeze/evictor/Makefile @@ -40,7 +40,7 @@ $(SERVER): $(OBJS) $(SOBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(DB_RPATH_LINK) -lFreeze $(LIBS) clean:: - -rm -f db/__catalog db/Test + -rm -f db/__catalog db/__catalogIndexList db/Test -rm -f db/log.* include .depend |