summaryrefslogtreecommitdiff
path: root/TAO/tao/diffs
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-04-08 13:28:04 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-04-08 13:28:04 +0000
commitdc1ad9386abcabddbb2b29eced7908c6e6f9cac7 (patch)
treeb55d1c1a4624b37395176c8838bb94f5210f7b51 /TAO/tao/diffs
parentc17b3307de2daa1cceeb55bdbabd68000ba0d250 (diff)
downloadATCD-dc1ad9386abcabddbb2b29eced7908c6e6f9cac7.tar.gz
ChangeLogTag: Fri Apr 8 12:29:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/diffs')
-rw-r--r--TAO/tao/diffs/Domain.diff16
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/diffs/Domain.diff b/TAO/tao/diffs/Domain.diff
index f1ee0bbb149..32d901b750a 100644
--- a/TAO/tao/diffs/Domain.diff
+++ b/TAO/tao/diffs/Domain.diff
@@ -5,13 +5,13 @@
//
-// $Id$
+// $Id$
-
+
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
@@ -39,6 +39,10 @@
#include "tao/Special_Basic_Arguments.h"
#include "ace/OS_NS_string.h"
-
+
+#include "tao/ORB_Core.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "ace/Dynamic_Service.h"
@@ -22,7 +22,7 @@
@@ -50,6 +54,44 @@
// TAO_IDL - Generated from
// be\be_visitor_arg_traits.cpp:69
-
+
+// TAO specific stuff.
+namespace CORBA
+{
@@ -34,7 +34,7 @@
+
+#if TAO_HAS_INTERCEPTORS == 1
+
-+ACE_TEMPLATE_SPECIALIZATION
++template<>
+void
+TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p)
+{
@@ -49,7 +49,7 @@
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
-+ACE_TEMPLATE_SPECIALIZATION
++template<>
+CORBA::Boolean
+TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr)
+{
@@ -71,14 +71,14 @@
//
-// $Id$
+// $Id$
-
+
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
@@ -51,7 +51,6 @@
#include "tao/Seq_Out_T.h"
-
+
#include "tao/PolicyC.h"
-#include "tao/InterfaceDefC.h"
-
+
#if defined (TAO_EXPORT_MACRO)
#undef TAO_EXPORT_MACRO