diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-03-07 18:35:50 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-03-07 18:35:50 +0000 |
| commit | 4f822f3847517e0b15804ec72ef9bbc895915138 (patch) | |
| tree | 427247f8eada6b3253e0a875022a426e433e81af | |
| parent | 8ba7b9929a43f6626d4f3dcbc4ecb34bc6e8e05c (diff) | |
| download | ATCD-4f822f3847517e0b15804ec72ef9bbc895915138.tar.gz | |
ChangeLogTag: Fri Mar 7 13:29:43 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/tao/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/IOPC.h | 2 | ||||
| -rw-r--r-- | TAO/tao/IOP_CodecC.h | 3 | ||||
| -rw-r--r-- | TAO/tao/IOP_IORC.h | 4 | ||||
| -rw-r--r-- | TAO/tao/Makefile.tao | 2 | ||||
| -rw-r--r-- | TAO/tao/Object.cpp | 2 |
6 files changed, 16 insertions, 5 deletions
diff --git a/TAO/tao/ChangeLog b/TAO/tao/ChangeLog index 8c7b56a97b8..4af708c3cb2 100644 --- a/TAO/tao/ChangeLog +++ b/TAO/tao/ChangeLog @@ -1,3 +1,11 @@ +Fri Mar 7 13:29:43 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tao/Object.cpp: + * tao/IOP_CodecC.h: + * tao/IOP_IORC.h: + * tao/Makefile.tao: + * tao/IOPC.h: Fixed compile errors with g++. + Fri Mar 07 09:49:35 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * TAO_IDL/be/be_codegen.cpp: diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h index 45442ff4974..3c9630fe92f 100644 --- a/TAO/tao/IOPC.h +++ b/TAO/tao/IOPC.h @@ -34,7 +34,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "TAO_export.h" +#include "TAO_Export.h" #include "IOP_IORC.h" #include "IOP_CodecC.h" diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h index 6cf826ae560..408161e909e 100644 --- a/TAO/tao/IOP_CodecC.h +++ b/TAO/tao/IOP_CodecC.h @@ -34,9 +34,10 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_export.h" +#include "tao/TAO_Export.h" #include "tao/Object.h" #include "tao/Exception.h" +#include "tao/Any.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h index 36cf6c9dd03..26b53b42b11 100644 --- a/TAO/tao/IOP_IORC.h +++ b/TAO/tao/IOP_IORC.h @@ -26,7 +26,6 @@ #define _TAO_IDL_ORIG_IOP_IORC_H_ #include "ace/pre.h" - #include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -34,8 +33,9 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/TAO_export.h" +#include "tao/TAO_Export.h" #include "tao/Sequence_T.h" +#include "tao/CDR.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao index d38c624ae56..3ae7ff8e80f 100644 --- a/TAO/tao/Makefile.tao +++ b/TAO/tao/Makefile.tao @@ -235,6 +235,8 @@ ORB_CORE_FILES = \ Synch_Reply_Dispatcher \ Synch_Refcountable \ Asynch_Reply_Dispatcher_Base \ + IOP_IORC \ + IOP_CodecC \ IOPC \ PollableC \ CONV_FRAMEC \ diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 85199ef73ed..17186358e47 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -734,7 +734,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj) return; } ACE_ENDTRY; - ACE_CHECK_RETURN (0); + ACE_CHECK; TAO_Stub_Auto_Ptr safe_objdata (objdata); |