[orbitcpp-list] Patch for compiling with gcc-2.96
Status: Beta
Brought to you by:
philipd
From: Mike B. <mik...@te...> - 2000-09-19 14:12:30
|
Here's a few changes to get the latest from cvs.orbitcpp.sourceforge.net to compile with gcc-2.96. The problem was that you had forward declaration for some of your scoped classes within a protected block, gcc-2.96 uses the permission of the forward declaration, unlike previous gcc's. I also get warnings about no newline at the end of several of the files from gcc-2.96, but I haven't bothered fixing those warnings. Here's the set of diffs: Index: orbitcpp/compiler/pass.hh =================================================================== RCS file: /cvsroot/orbitcpp/orbitcpp/compiler/pass.hh,v retrieving revision 1.1 diff -u -r1.1 pass.hh --- orbitcpp/compiler/pass.hh 2000/04/15 13:32:12 1.1 +++ orbitcpp/compiler/pass.hh 2000/09/19 13:14:50 @@ -120,14 +120,6 @@ class IDLOutputPass : public IDLPass { typedef IDLPass Super; -protected: - ostream &m_header; - ostream &m_module; - Indent indent; - Indent mod_indent; - class IDLOutputJob; - vector<IDLOutputJob *> m_outputjobqueue; - public: class IDLOutputJob : public IDLJob { protected: @@ -152,6 +144,12 @@ void runJobs(string const &event = ""); protected: + ostream &m_header; + ostream &m_module; + Indent indent; + Indent mod_indent; + vector<IDLOutputJob *> m_outputjobqueue; + void queueJob(IDLJob *job) { Super::queueJob(job); } @@ -162,5 +160,6 @@ + +#endif -#endif \ No newline at end of file Index: orbitcpp/compiler/types.hh =================================================================== RCS file: /cvsroot/orbitcpp/orbitcpp/compiler/types.hh,v retrieving revision 1.33 diff -u -r1.33 types.hh --- orbitcpp/compiler/types.hh 2000/09/17 21:34:55 1.33 +++ orbitcpp/compiler/types.hh 2000/09/19 13:14:50 @@ -493,6 +493,7 @@ // IDLEnum -------------------------------------------------------------------- class IDLEnum : public IDLUserDefSimpleType { +public: typedef std::vector<IDLEnumComponent *> ElementsVec; typedef ElementsVec::const_iterator const_iterator; Index: orbitcpp/orb/orbitcpp_exception.hh =================================================================== RCS file: /cvsroot/orbitcpp/orbitcpp/orb/orbitcpp_exception.hh,v retrieving revision 1.10 diff -u -r1.10 orbitcpp_exception.hh --- orbitcpp/orb/orbitcpp_exception.hh 2000/06/03 20:19:19 1.10 +++ orbitcpp/orb/orbitcpp_exception.hh 2000/09/19 13:14:50 @@ -161,7 +161,7 @@ #define P(name,quotedname) ORBITCPP_SYSEXCEPTION_FACTORY(name,quotedname) #include <orb/orbitcpp_exceptionlist.hh> - #undef P*/ + #undef P class UserException : public Exception { public: Index: orbitcpp/orb/orbitcpp_tools.cc =================================================================== RCS file: /cvsroot/orbitcpp/orbitcpp/orb/orbitcpp_tools.cc,v retrieving revision 1.8 diff -u -r1.8 orbitcpp_tools.cc --- orbitcpp/orb/orbitcpp_tools.cc 2000/08/22 06:19:31 1.8 +++ orbitcpp/orb/orbitcpp_tools.cc 2000/09/19 13:14:50 @@ -28,6 +28,7 @@ #include <cstdio> +#include <cstdlib> #include <orb/orbitcpp_tools.hh> #include <orb/orbitcpp_exception.hh> |