diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Makefile | 2 | ||||
| -rw-r--r-- | cpp/config/Make.rules | 3 | ||||
| -rw-r--r-- | cpp/doc/Makefile | 4 | ||||
| -rw-r--r-- | cpp/doc/main.sgml | 42 | ||||
| -rw-r--r-- | cpp/src/Slice/Parser.cpp | 17 |
5 files changed, 55 insertions, 13 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 326b1bfb638..fb593205a9e 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -12,7 +12,7 @@ top_srcdir = . include $(top_srcdir)/config/Make.rules -SUBDIRS = src test demo +SUBDIRS = src test demo doc $(EVERYTHING):: @for subdir in $(SUBDIRS); \ diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 96824b60820..ddff0a83cd0 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -29,6 +29,9 @@ BASELIBS = -lstlport_gcc_debug -lJTC -lpthread LIBS = -lIce $(BASELIBS) SLICE = $(bindir)/slice2cpp +HTMLDSL = /usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl +SGML2HTML = jade -t sgml -d $(HTMLDSL) -i html + EVERYTHING = all depend clean .SUFFIXES: diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile index bda1084ef79..07e1285e29d 100644 --- a/cpp/doc/Makefile +++ b/cpp/doc/Makefile @@ -15,10 +15,8 @@ TARGETS = index.html \ slice.html \ cppmap.html -HTMLDSL = /usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl - include $(top_srcdir)/config/Make.rules $(TARGETS): main.sgml rm -f $(TARGETS) - jade -t sgml -d $(HTMLDSL) -i html main.sgml
\ No newline at end of file + $(SGML2HTML) main.sgml
\ No newline at end of file diff --git a/cpp/doc/main.sgml b/cpp/doc/main.sgml new file mode 100644 index 00000000000..a2ceb14c174 --- /dev/null +++ b/cpp/doc/main.sgml @@ -0,0 +1,42 @@ +<!DOCTYPE BOOK PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<BOOK ID="ICE"><?dbhtml filename="index.html">
+<BOOKINFO>
+<TITLE>Ice User's Manual</TITLE>
+<SUBTITLE>A Guide to the Internet Communications Engine</SUBTITLE>
+<AUTHORGROUP>
+<AUTHOR>
+<FIRSTNAME>Marc</FIRSTNAME>
+<SURNAME>Laukien</SURNAME>
+</AUTHOR>
+</AUTHORGROUP>
+<PUBLISHER>
+<PUBLISHERNAME>Mutable Realms, Inc.</PUBLISHERNAME>
+<ADDRESS>
+<CITY>Huntsville</CITY>
+<STATE>Alabama</STATE>
+<COUNTRY>USA</COUNTRY>
+</ADDRESS>
+</PUBLISHER>
+<RELEASEINFO>Version 0.0.1</RELEASEINFO>
+<PUBDATE>Date to be inserted here...</PUBDATE>
+<LEGALNOTICE>
+<PARA>Legal stuff to be inserted here...</PARA>
+</LEGALNOTICE>
+<COPYRIGHT>
+<YEAR>2001</YEAR>
+<HOLDER>Mutable Realms, Inc. All rights reserved.</HOLDER>
+</COPYRIGHT>
+</BOOKINFO>
+<CHAPTER ID="INTRO"><?dbhtml filename="intro.html">
+<TITLE>Introduction</TITLE>
+<PARA>blahblahblah...</PARA>
+</CHAPTER>
+<CHAPTER ID="SLICE"><?dbhtml filename="slice.html">
+<TITLE>Slice</TITLE>
+<PARA>blahblahblah...</PARA>
+</CHAPTER>
+<CHAPTER ID="CPPMAP"><?dbhtml filename="cppmap.html">
+<TITLE>The Slice to C++ Mapping</TITLE>
+<PARA>blahblahblah...</PARA>
+</CHAPTER>
+</BOOK>
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index af6b8e88ffe..04f7b3add7b 100644 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -777,9 +777,9 @@ Slice::ClassDef::operations() p != contents_.end(); ++p) { - Operation_ptr derived = Operation_ptr::dynamicCast(*p); - if(derived) - result.push_back(derived); + Operation_ptr q = Operation_ptr::dynamicCast(*p); + if(q) + result.push_back(q); } return result; } @@ -790,9 +790,8 @@ Slice::ClassDef::allOperations() OperationList result = operations(); result.sort(); result.unique(); - ClassList all = allBases(); - for(ClassList::iterator p = all.begin(); - p != all.end(); + for(ClassList::iterator p = bases_.begin(); + p != bases_.end(); ++p) { OperationList li = (*p) -> allOperations(); @@ -810,9 +809,9 @@ Slice::ClassDef::dataMembers() p != contents_.end(); ++p) { - DataMember_ptr derived = DataMember_ptr::dynamicCast(*p); - if(derived) - result.push_back(derived); + DataMember_ptr q = DataMember_ptr::dynamicCast(*p); + if(q) + result.push_back(q); } return result; } |