summaryrefslogtreecommitdiff
path: root/TAO/tao/Messaging/diffs
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-03-29 12:17:30 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-03-29 12:17:30 +0000
commited6ada361c64ff2f600aaefb2fa384f563869d9f (patch)
tree2c5a7d18fa7429516f4f95de92f769ee486f594f /TAO/tao/Messaging/diffs
parent1fb351dd4641b1d0d7e8c9b3915a8893fba83e29 (diff)
downloadATCD-ed6ada361c64ff2f600aaefb2fa384f563869d9f.tar.gz
ChangeLogTag: Mon Mar 28 12:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Messaging/diffs')
-rw-r--r--TAO/tao/Messaging/diffs/Messaging.diff22
-rw-r--r--TAO/tao/Messaging/diffs/Messaging_No_Impl.diff4
2 files changed, 13 insertions, 13 deletions
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
index 29699e7d8ad..04073bd36f8 100644
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ b/TAO/tao/Messaging/diffs/Messaging.diff
@@ -1,5 +1,5 @@
---- orig/MessagingC.h 2005-02-22 15:22:16.445811200 +0100
-+++ MessagingC.h 2005-02-22 15:24:54.643288000 +0100
+--- orig/MessagingC.h 2005-03-29 14:10:15.848518400 +0200
++++ MessagingC.h 2005-03-29 14:10:19.884321600 +0200
@@ -40,6 +40,10 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -11,8 +11,8 @@
#include "messaging_export.h"
#include "tao/Valuetype/ValueBase.h"
#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
---- orig/MessagingC.cpp 2005-02-22 15:22:16.445811200 +0100
-+++ MessagingC.cpp 2005-02-22 15:24:20.994904000 +0100
+--- orig/MessagingC.cpp 2005-03-29 14:10:15.848518400 +0200
++++ MessagingC.cpp 2005-03-29 14:10:19.884321600 +0200
@@ -29,7 +29,7 @@
// be\be_codegen.cpp:302
@@ -22,19 +22,19 @@
#include "tao/CDR.h"
#include "tao/Object_T.h"
#include "tao/ORB_Core.h"
---- orig/MessagingA.cpp 2005-02-22 15:22:16.445811200 +0100
-+++ MessagingA.cpp 2005-02-22 15:24:27.514278400 +0100
+--- orig/MessagingA.cpp 2005-03-29 14:10:15.848518400 +0200
++++ MessagingA.cpp 2005-03-29 14:11:22.284048000 +0200
@@ -25,7 +25,7 @@
// Information about TAO is available at:
// http://www.cs.wustl.edu/~schmidt/TAO.html
-#include "MessagingC.h"
+#include "Messaging.h"
- #include "tao/Typecode.h"
- #include "tao/CDR.h"
- #include "tao/Any.h"
---- orig/MessagingS.h 2005-02-22 15:22:16.445811200 +0100
-+++ MessagingS.h 2005-02-22 15:23:21.078748800 +0100
+ #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 /**/ "ace/pre.h"
diff --git a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
index f53a2f3b234..4aa06ad3ffe 100644
--- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
+++ b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
@@ -1,5 +1,5 @@
---- orig/Messaging_No_ImplC.h 2005-02-22 15:22:14.493003200 +0100
-+++ Messaging_No_ImplC.h 2005-02-22 15:22:23.485934400 +0100
+--- 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 @@
#include "tao/PolicyC.h"
#include "tao/PollableC.h"