diff options
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/Unbounded_Octet_Sequence_T.h | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index eaee9fc44a4..775c7dcc55f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Jan 9 15:14:09 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com> + + * tao/Unbounded_Octet_Sequence_T.h: + + Refactored #include "ace/OS_NS_string.h" for memcmp() out of the + two TAO_NO_COPY_OCTET_SEQUENCES branches and move it into the + common #include area. This reverts changes yesterday by me and + this morning by Chad Elliott. + Tue Jan 9 14:06:55 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/DynamicAny/diffs/DynamicAny.pidl.diff: diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h index a1a27f57808..cad24629621 100644 --- a/TAO/tao/Unbounded_Octet_Sequence_T.h +++ b/TAO/tao/Unbounded_Octet_Sequence_T.h @@ -12,6 +12,7 @@ #include "tao/orbconf.h" #include "tao/Unbounded_Value_Sequence_T.h" +#include "ace/OS_NS_string.h" #if (TAO_NO_COPY_OCTET_SEQUENCES == 1) @@ -23,7 +24,6 @@ #include "tao/Basic_Types.h" #include "ace/Message_Block.h" #include "ace/OS_Memory.h" -#include "ace/OS_NS_string.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -323,8 +323,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #if (TAO_NO_COPY_OCTET_SEQUENCES == 0) -#include "ace/OS_NS_string.h" - // This doesn't work always for unexplained reason. At least // PortableServer::Active_Object_Map.cpp fails to compile with some compilers. // But I'm keeping this in for the moment so that it may be |