diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2003-03-06 21:50:17 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2003-03-06 21:50:17 +0000 |
| commit | 8dd085b29748a224a8ca5b425cfcd80c497c63e5 (patch) | |
| tree | 207c0015c857655f185b0e7fbadef8ab4698bce9 | |
| parent | 221f699874c70e1a9f405392e7b771c12a8d1cf2 (diff) | |
| download | ATCD-8dd085b29748a224a8ca5b425cfcd80c497c63e5.tar.gz | |
Modifications after compiling on VC6.
| -rw-r--r-- | TAO/PMBChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Message_State.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Incoming_Message_Queue.cpp | 11 |
3 files changed, 13 insertions, 11 deletions
diff --git a/TAO/PMBChangeLog b/TAO/PMBChangeLog index a6d0aa76583..06d916b5f15 100644 --- a/TAO/PMBChangeLog +++ b/TAO/PMBChangeLog @@ -1,3 +1,13 @@ +Thu Mar 6 15:27:14 2003 Chris Cleeland <cleeland_c@ociweb.com> + + * tao/Incoming_Message_Queue.cpp: Removed Shattering Encapsulation + hack around ace/Message_Block.h inclusion to make this link + properly on VC6. + + * tao/GIOP_Message_State.cpp: Moved initialization of + TAO_Debug_Msg_Emitter_Guard::MAGIC_LENGTH outside the class + declaration. + Wed Mar 5 13:08:37 2003 Chris Cleeland <cleeland_c@ociweb.com> * tao/GIOP_Message_Generator_Parser_Impl.inl (check_revision): diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp index b86a456a140..ef6cd7ce057 100644 --- a/TAO/tao/GIOP_Message_State.cpp +++ b/TAO/tao/GIOP_Message_State.cpp @@ -37,11 +37,12 @@ public: } private: - static const int MAGIC_LENGTH = 8; // " begin\n" + \000 + static const int MAGIC_LENGTH; unsigned int which_level_; char* msg_; }; +const int TAO_Debug_Msg_Emitter_Guard::MAGIC_LENGTH = 8; // " begin\n" + \000 ACE_RCSID(tao, GIOP_Message_State, "$Id$") diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp index 4228637c09c..028491a8a09 100644 --- a/TAO/tao/Incoming_Message_Queue.cpp +++ b/TAO/tao/Incoming_Message_Queue.cpp @@ -1,17 +1,8 @@ -// We're doing this because we need to extend ACE_Message_Block, but -// that interface is currently "frozen". Therefore, I'm using static -// functions in this compilation unit that I would normally add as part -// of the interface. -#define private public -#define protected public -#include "ace/Message_Block.h" -#undef private -#undef public - #include "Incoming_Message_Queue.h" #include "ORB_Core.h" #include "debug.h" #include "ace/Malloc_T.h" +#include "ace/Message_Block.h" #if !defined (__ACE_INLINE__) # include "Incoming_Message_Queue.inl" |