diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-13 18:17:29 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-13 18:17:29 +0000 |
| commit | ef33209956dc481eb049a60edc87230f9f21499c (patch) | |
| tree | 612cb6ab3682e6d08b04186d4c5451fc4e541d67 /TAO/tao/Messaging/diffs | |
| parent | ea45cecfa741ad038ca1b9eccb3be99b76bf0f85 (diff) | |
| download | ATCD-ef33209956dc481eb049a60edc87230f9f21499c.tar.gz | |
ChangeLogTag: Wed Jul 13 18:15:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Messaging/diffs')
| -rw-r--r-- | TAO/tao/Messaging/diffs/Messaging.diff | 26 | ||||
| -rw-r--r-- | TAO/tao/Messaging/diffs/Messaging_No_Impl.diff | 8 |
2 files changed, 17 insertions, 17 deletions
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff index 04073bd36f8..2864741069b 100644 --- a/TAO/tao/Messaging/diffs/Messaging.diff +++ b/TAO/tao/Messaging/diffs/Messaging.diff @@ -1,5 +1,5 @@ ---- orig/MessagingC.h 2005-03-29 14:10:15.848518400 +0200 -+++ MessagingC.h 2005-03-29 14:10:19.884321600 +0200 +--- orig/MessagingC.h 2005-07-13 20:07:51.586041600 +0200 ++++ MessagingC.h 2005-07-13 20:07:52.988057600 +0200 @@ -40,6 +40,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -11,10 +11,10 @@ #include "messaging_export.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/Valuetype_Adapter_Impl.h" ---- orig/MessagingC.cpp 2005-03-29 14:10:15.848518400 +0200 -+++ MessagingC.cpp 2005-03-29 14:10:19.884321600 +0200 +--- orig/MessagingC.cpp 2005-07-13 20:07:51.586041600 +0200 ++++ MessagingC.cpp 2005-07-13 20:07:52.998072000 +0200 @@ -29,7 +29,7 @@ - // be\be_codegen.cpp:302 + // be\be_codegen.cpp:291 -#include "MessagingC.h" @@ -22,8 +22,8 @@ #include "tao/CDR.h" #include "tao/Object_T.h" #include "tao/ORB_Core.h" ---- orig/MessagingA.cpp 2005-03-29 14:10:15.848518400 +0200 -+++ MessagingA.cpp 2005-03-29 14:11:22.284048000 +0200 +--- orig/MessagingA.cpp 2005-07-13 20:07:51.586041600 +0200 ++++ MessagingA.cpp 2005-07-13 20:07:53.028115200 +0200 @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html @@ -32,19 +32,19 @@ +#include "Messaging.h" #include "tao/Null_RefCount_Policy.h" #include "tao/TypeCode_Constants.h" - #include "tao/Alias_TypeCode.h" ---- orig/MessagingS.h 2005-03-29 14:10:15.848518400 +0200 -+++ MessagingS.h 2005-03-29 14:10:19.954422400 +0200 -@@ -33,11 +33,8 @@ + #include "tao/Alias_TypeCode_Static.h" +--- orig/MessagingS.h 2005-07-13 20:07:51.586041600 +0200 ++++ MessagingS.h 2005-07-13 20:08:42.519280000 +0200 +@@ -33,11 +33,7 @@ #include /**/ "ace/pre.h" -#include "MessagingC.h" -+#include "Messaging.h" - #include "tao/PollableS.h" -#include "tao/Messaging/Messaging_SyncScope_PolicyS.h" -#include "tao/Messaging/Messaging_RT_PolicyS.h" -#include "tao/Messaging/Messaging_No_ImplS.h" +-#include "tao/Messaging/PollableS.h" ++#include "Messaging.h" #include "tao/OctetSeqS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff index 4aa06ad3ffe..1f8dc881981 100644 --- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff +++ b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff @@ -1,8 +1,8 @@ ---- orig/Messaging_No_ImplC.h 2005-03-29 14:10:14.786992000 +0200 -+++ Messaging_No_ImplC.h 2005-03-29 14:10:20.014508800 +0200 -@@ -52,6 +52,11 @@ +--- orig/Messaging_No_ImplC.h 2005-07-13 20:07:50.083881600 +0200 ++++ Messaging_No_ImplC.h 2005-07-13 20:07:53.158302400 +0200 +@@ -51,6 +51,11 @@ + #include "tao/TimeBaseC.h" #include "tao/PolicyC.h" - #include "tao/PollableC.h" +#if defined(TRANSPARENT) +// Some platforms define this macro for ioctl() |