diff options
| author | Michi Henning <michi@zeroc.com> | 2006-12-20 02:21:37 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2006-12-20 02:21:37 +0000 |
| commit | 9089f4b0e6b03173e3bc42bf8bb84f39406ce4fc (patch) | |
| tree | 9707c4fdeebbfafae73c36500f4ff4c7bfd8e689 /cpp | |
| parent | Fixed XML writing to produce new property attributes (diff) | |
| download | ice-9089f4b0e6b03173e3bc42bf8bb84f39406ce4fc.tar.bz2 ice-9089f4b0e6b03173e3bc42bf8bb84f39406ce4fc.tar.xz ice-9089f4b0e6b03173e3bc42bf8bb84f39406ce4fc.zip | |
Hooked up Windows build.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Makefile | 1 | ||||
| -rw-r--r-- | cpp/src/slice2html/Gen.cpp | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/cpp/src/Makefile b/cpp/src/Makefile index a4d5315ebba..657583ec7eb 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -25,6 +25,7 @@ SUBDIRS = IceUtil \ slice2cppe \ slice2javae \ slice2rb \ + slice2html \ Ice \ IceXML \ IceSSL \ diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp index 64d5632165b..90cb42305fc 100644 --- a/cpp/src/slice2html/Gen.cpp +++ b/cpp/src/slice2html/Gen.cpp @@ -1403,7 +1403,6 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p) #endif ModuleList modules = p->modules(); - //modules.erase(remove_if(modules.begin(), modules.end(), ::IceUtil::constMemFun(&Contained::includeLevel)), modules.end()); if(!modules.empty()) { @@ -1429,7 +1428,6 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p) assert(_out.currIndent() == indent); ClassList classesAndInterfaces = p->classes(); - //classesAndInterfaces.erase(remove_if(classesAndInterfaces.begin(), classesAndInterfaces.end(), ::IceUtil::constMemFun(&Contained::includeLevel)), classesAndInterfaces.end()); ClassList classes; ClassList interfaces; remove_copy_if(classesAndInterfaces.begin(), classesAndInterfaces.end(), back_inserter(classes), @@ -1484,7 +1482,6 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p) assert(_out.currIndent() == indent); ExceptionList exceptions = p->exceptions(); - //exceptions.erase(remove_if(exceptions.begin(), exceptions.end(), ::IceUtil::constMemFun(&Contained::includeLevel)), exceptions.end()); if(!exceptions.empty()) { @@ -1510,7 +1507,6 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p) assert(_out.currIndent() == indent); StructList structs = p->structs(); - //structs.erase(remove_if(structs.begin(), structs.end(), ::IceUtil::constMemFun(&Contained::includeLevel)), structs.end()); if(!structs.empty()) { @@ -1536,7 +1532,6 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p) assert(_out.currIndent() == indent); SequenceList sequences = p->sequences(); - //sequences.erase(remove_if(sequences.begin(), sequences.end(), ::IceUtil::constMemFun(&Contained::includeLevel)), sequences.end()); if(!sequences.empty()) { @@ -1562,7 +1557,6 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p) assert(_out.currIndent() == indent); DictionaryList dictionaries = p->dictionaries(); - //dictionaries.erase(remove_if(dictionaries.begin(), dictionaries.end(), ::IceUtil::constMemFun(&Contained::includeLevel)), dictionaries.end()); if(!dictionaries.empty()) { @@ -1588,7 +1582,6 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p) assert(_out.currIndent() == indent); EnumList enums = p->enums(); - //enums.erase(remove_if(enums.begin(), enums.end(), ::IceUtil::constMemFun(&Contained::includeLevel)), enums.end()); if(!enums.empty()) { |