diff options
| author | Michi Henning <michi@zeroc.com> | 2008-04-03 12:36:57 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2008-04-03 12:36:57 +1000 |
| commit | 27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc (patch) | |
| tree | 4d825c1cb800b154ea4b33b238027f1ff9a13531 /cpp/src/slice2html | |
| parent | Fixed comment for GCShared (wrong namespace). (diff) | |
| parent | Merge branch 'master' of cvs:/home/git/ice (diff) | |
| download | ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.tar.bz2 ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.tar.xz ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/slice2html')
| -rw-r--r-- | cpp/src/slice2html/Gen.h | 1 | ||||
| -rw-r--r-- | cpp/src/slice2html/Makefile.mak | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h index 362c612d335..3709c515495 100644 --- a/cpp/src/slice2html/Gen.h +++ b/cpp/src/slice2html/Gen.h @@ -114,6 +114,7 @@ public: private: + using GeneratorBase::printHeaderFooter; void printHeaderFooter(); typedef ::std::pair< ::std::string, ::std::string> StringPair; diff --git a/cpp/src/slice2html/Makefile.mak b/cpp/src/slice2html/Makefile.mak index 7b35976070e..a3110b9790f 100644 --- a/cpp/src/slice2html/Makefile.mak +++ b/cpp/src/slice2html/Makefile.mak @@ -22,7 +22,7 @@ SRCS = $(OBJS:.obj=.cpp) CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes"
+!if "$(GENERATE_PDB)" == "yes"
PDBFLAGS = /pdb:$(NAME:.exe=.pdb)
!endif
|