summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/tao/Messaging/diffs/Messaging.diff50
-rw-r--r--TAO/tao/Messaging/diffs/Messaging_No_Impl.diff14
2 files changed, 0 insertions, 64 deletions
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
deleted file mode 100644
index e7cb962f5a9..00000000000
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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 */
-
-+#ifndef TAO_MESSAGING_SAFE_INCLUDE
-+#error "You should not include MessagingC.h directly, use Messaging.h"
-+#endif /* !TAO_MESSAGING_SAFE_INCLUDE */
-+
- #include "messaging_export.h"
- #include "tao/Valuetype/ValueBase.h"
- #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
---- 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:291
-
-
--#include "MessagingC.h"
-+#include "Messaging.h"
- #include "tao/CDR.h"
- #include "tao/Object_T.h"
- #include "tao/ORB_Core.h"
---- 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
-
--#include "MessagingC.h"
-+#include "Messaging.h"
- #include "tao/Null_RefCount_Policy.h"
- #include "tao/TypeCode_Constants.h"
- #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 "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 "tao/Messaging/OldExceptionHolderS.h"
-+#include "Messaging.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
deleted file mode 100644
index 1f8dc881981..00000000000
--- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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"
-
-+#if defined(TRANSPARENT)
-+// Some platforms define this macro for ioctl()
-+#undef TRANSPARENT
-+#endif
-+
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
- #endif