summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/tao/Messaging/MessagingC.cpp81
-rw-r--r--TAO/tao/Messaging/MessagingC.h3
-rw-r--r--TAO/tao/Messaging/MessagingS.cpp3
-rw-r--r--TAO/tao/Messaging/Messaging_No_ImplC.cpp59
-rw-r--r--TAO/tao/Messaging/Messaging_No_ImplC.h5
-rw-r--r--TAO/tao/Messaging/Messaging_RT_PolicyC.cpp9
-rw-r--r--TAO/tao/Messaging/Messaging_RT_PolicyC.h1
-rw-r--r--TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp7
-rw-r--r--TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h1
-rw-r--r--TAO/tao/Messaging/TAO_ExtC.cpp7
-rw-r--r--TAO/tao/Messaging/TAO_ExtC.h1
-rw-r--r--TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl2
-rw-r--r--TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp423
-rw-r--r--TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h243
-rw-r--r--TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i60
-rw-r--r--TAO/tao/RTCORBA/RT_Policy_i.cpp1
-rw-r--r--TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp1
17 files changed, 446 insertions, 461 deletions
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index b8d6d44452a..23c74ce92b8 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -30,6 +30,7 @@
#include "Messaging.h"
+#include "tao/CDR.h"
#include "tao/Object_T.h"
#include "tao/Typecode.h"
#include "tao/Any_Impl_T.h"
@@ -53,71 +54,71 @@ namespace TAO
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
42,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x4d657373),
- ACE_NTOHL (0x6167696e),
- ACE_NTOHL (0x672f4578),
- ACE_NTOHL (0x63657074),
- ACE_NTOHL (0x696f6e48),
- ACE_NTOHL (0x6f6c6465),
- ACE_NTOHL (0x723a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x4d657373),
+ ACE_NTOHL (0x6167696e),
+ ACE_NTOHL (0x672f4578),
+ ACE_NTOHL (0x63657074),
+ ACE_NTOHL (0x696f6e48),
+ ACE_NTOHL (0x6f6c6465),
+ ACE_NTOHL (0x723a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
16,
- ACE_NTOHL (0x45786365),
- ACE_NTOHL (0x7074696f),
- ACE_NTOHL (0x6e486f6c),
+ ACE_NTOHL (0x45786365),
+ ACE_NTOHL (0x7074696f),
+ ACE_NTOHL (0x6e486f6c),
ACE_NTOHL (0x64657200), // name = ExceptionHolder
0, // value modifier
CORBA::tk_null, // no stateful base valuetype
3, // member count
20,
- ACE_NTOHL (0x69735f73),
- ACE_NTOHL (0x79737465),
- ACE_NTOHL (0x6d5f6578),
- ACE_NTOHL (0x63657074),
+ ACE_NTOHL (0x69735f73),
+ ACE_NTOHL (0x79737465),
+ ACE_NTOHL (0x6d5f6578),
+ ACE_NTOHL (0x63657074),
ACE_NTOHL (0x696f6e00), // name = is_system_exception
CORBA::tk_boolean,
1, // data member visibility marker
11,
- ACE_NTOHL (0x62797465),
- ACE_NTOHL (0x5f6f7264),
+ ACE_NTOHL (0x62797465),
+ ACE_NTOHL (0x5f6f7264),
ACE_NTOHL (0x65720000), // name = byte_order
CORBA::tk_boolean,
1, // data member visibility marker
20,
- ACE_NTOHL (0x6d617273),
- ACE_NTOHL (0x68616c65),
- ACE_NTOHL (0x645f6578),
- ACE_NTOHL (0x63657074),
+ ACE_NTOHL (0x6d617273),
+ ACE_NTOHL (0x68616c65),
+ ACE_NTOHL (0x645f6578),
+ ACE_NTOHL (0x63657074),
ACE_NTOHL (0x696f6e00), // name = marshaled_exception
CORBA::tk_alias, // typecode kind for typedefs
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
31,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f4f63),
- ACE_NTOHL (0x74657453),
- ACE_NTOHL (0x65713a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f4f63),
+ ACE_NTOHL (0x74657453),
+ ACE_NTOHL (0x65713a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
9,
- ACE_NTOHL (0x4f637465),
- ACE_NTOHL (0x74536571),
+ ACE_NTOHL (0x4f637465),
+ ACE_NTOHL (0x74536571),
ACE_NTOHL (0x0), // name = OctetSeq
CORBA::tk_sequence, // typecode kind
12, // encapsulation length
@@ -148,7 +149,7 @@ namespace Messaging
// TAO_IDL - Generated from
// be\be_visitor_valuetype/valuetype_cs.cpp:66
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
void
TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref (
Messaging::ExceptionHolder * p
@@ -157,7 +158,7 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::tao_add_ref (
CORBA::add_ref (p);
}
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
void
TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref (
Messaging::ExceptionHolder * p
@@ -166,7 +167,7 @@ TAO::Value_Traits<Messaging::ExceptionHolder>::tao_remove_ref (
CORBA::remove_ref (p);
}
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
void
TAO::Value_Traits<Messaging::ExceptionHolder>::tao_release (
Messaging::ExceptionHolder * p
@@ -182,7 +183,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
{
return 0;
}
-
+
return dynamic_cast< ::Messaging::ExceptionHolder * > (v);
}
@@ -322,7 +323,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -439,7 +440,7 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_ReplyHandler[] =
{
@@ -780,7 +781,7 @@ CORBA::Boolean operator>> (
}
// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index 81bded3997d..d2ad96ad6ef 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -43,8 +43,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/Messaging/messaging_export.h"
-#include "tao/CDR.h"
+#include "messaging_export.h"
#include "tao/Environment.h"
#include "tao/Object.h"
#include "tao/Valuetype/ValueBase.h"
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index a9d8ea8c003..463beeaba52 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -44,6 +44,7 @@
#include "tao/Object_T.h"
#include "tao/Typecode.h"
#include "tao/DynamicC.h"
+#include "tao/CDR.h"
#include "tao/PortableInterceptor.h"
#if TAO_HAS_INTERCEPTORS == 1
#include "tao/RequestInfo_Util.h"
@@ -87,7 +88,7 @@ public:
};
/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\bcb6dd\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup */
unsigned int
TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
{
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
index 727b6657a5d..4c3c75a122e 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -30,6 +30,7 @@
#include "Messaging_No_ImplC.h"
+#include "tao/CDR.h"
#include "tao/Typecode.h"
#include "tao/Any_Impl_T.h"
#include "tao/Any_Dual_Impl_T.h"
@@ -53,7 +54,7 @@ namespace TAO
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_Priority[] =
{
@@ -91,7 +92,7 @@ namespace Messaging
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RebindMode[] =
{
@@ -130,7 +131,7 @@ namespace Messaging
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RoutingType[] =
{
@@ -169,7 +170,7 @@ namespace Messaging
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_Ordering[] =
{
@@ -243,7 +244,7 @@ TAO::Objref_Traits<Messaging::RebindPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -356,7 +357,7 @@ Messaging::RebindPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RebindPolicy[] =
{
@@ -394,7 +395,7 @@ namespace Messaging
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_PriorityRange[] =
{
@@ -526,7 +527,7 @@ TAO::Objref_Traits<Messaging::RequestPriorityPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -639,7 +640,7 @@ Messaging::RequestPriorityPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
{
@@ -717,7 +718,7 @@ TAO::Objref_Traits<Messaging::ReplyPriorityPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -830,7 +831,7 @@ Messaging::ReplyPriorityPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
{
@@ -907,7 +908,7 @@ TAO::Objref_Traits<Messaging::RequestStartTimePolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -1020,7 +1021,7 @@ Messaging::RequestStartTimePolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
{
@@ -1099,7 +1100,7 @@ TAO::Objref_Traits<Messaging::RequestEndTimePolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -1212,7 +1213,7 @@ Messaging::RequestEndTimePolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
{
@@ -1290,7 +1291,7 @@ TAO::Objref_Traits<Messaging::ReplyStartTimePolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -1403,7 +1404,7 @@ Messaging::ReplyStartTimePolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
{
@@ -1481,7 +1482,7 @@ TAO::Objref_Traits<Messaging::ReplyEndTimePolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -1594,7 +1595,7 @@ Messaging::ReplyEndTimePolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
{
@@ -1671,7 +1672,7 @@ TAO::Objref_Traits<Messaging::RelativeRequestTimeoutPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -1784,7 +1785,7 @@ Messaging::RelativeRequestTimeoutPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
{
@@ -1830,7 +1831,7 @@ namespace Messaging
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
{
@@ -1966,7 +1967,7 @@ TAO::Objref_Traits<Messaging::RoutingPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -2079,7 +2080,7 @@ Messaging::RoutingPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
{
@@ -2153,7 +2154,7 @@ TAO::Objref_Traits<Messaging::MaxHopsPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -2266,7 +2267,7 @@ Messaging::MaxHopsPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
{
@@ -2340,7 +2341,7 @@ TAO::Objref_Traits<Messaging::QueueOrderPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -2453,7 +2454,7 @@ Messaging::QueueOrderPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
{
@@ -3414,7 +3415,7 @@ CORBA::Boolean operator>> (
}
// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index b7a8c3698e5..f85f397cfe4 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -40,7 +40,6 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "messaging_export.h"
-#include "tao/CDR.h"
#include "tao/Environment.h"
#include "tao/Object.h"
#include "tao/Objref_VarOut_T.h"
@@ -1933,13 +1932,13 @@ TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::QueueOrderPolicy
TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::QueueOrderPolicy_ptr &);
// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PriorityRange &);
TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::PriorityRange &);
// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::RoutingTypeRange &);
TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &);
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
index 7958b0b4e21..7fdcf3225e8 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -30,6 +30,7 @@
#include "Messaging_RT_PolicyC.h"
+#include "tao/CDR.h"
#include "tao/Typecode.h"
#include "tao/Any_Impl_T.h"
#include "ace/OS_NS_string.h"
@@ -52,7 +53,7 @@ namespace TAO
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_Timeout[] =
{
@@ -141,7 +142,7 @@ TAO::Objref_Traits<Messaging::RelativeRoundtripTimeoutPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -254,7 +255,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
{
@@ -370,7 +371,7 @@ operator>>= (
}
// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
index 5fef17612f6..bc35afd3dec 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h
@@ -40,7 +40,6 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "messaging_export.h"
-#include "tao/CDR.h"
#include "tao/Environment.h"
#include "tao/Object.h"
#include "tao/Objref_VarOut_T.h"
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
index e5445791a4e..bf5c226f661 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -30,6 +30,7 @@
#include "Messaging_SyncScope_PolicyC.h"
+#include "tao/CDR.h"
#include "tao/Typecode.h"
#include "tao/Any_Impl_T.h"
#include "ace/OS_NS_string.h"
@@ -88,7 +89,7 @@ TAO::Objref_Traits<Messaging::SyncScopePolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -201,7 +202,7 @@ Messaging::SyncScopePolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
{
@@ -309,7 +310,7 @@ operator>>= (
}
// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
index 3fb18624f7b..b901877a1ec 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h
@@ -40,7 +40,6 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "messaging_export.h"
-#include "tao/CDR.h"
#include "tao/Environment.h"
#include "tao/Object.h"
#include "tao/Objref_VarOut_T.h"
diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp
index a9d31daa3e3..14de8ef1ea2 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -30,6 +30,7 @@
#include "TAO_ExtC.h"
+#include "tao/CDR.h"
#include "tao/Typecode.h"
#include "tao/Any_Impl_T.h"
#include "ace/OS_NS_string.h"
@@ -88,7 +89,7 @@ TAO::Objref_Traits<TAO::ConnectionTimeoutPolicy>::tao_marshal (
TAO_OutputCDR & cdr
)
{
- return p->marshal (cdr);
+ return CORBA::Object::marshal (p, cdr);
}
// Function pointer for collocation factory initialization.
@@ -201,7 +202,7 @@ TAO::ConnectionTimeoutPolicy::marshal (TAO_OutputCDR &)
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_TAO_ConnectionTimeoutPolicy[] =
{
@@ -310,7 +311,7 @@ operator>>= (
}
// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h
index a240b2d6aef..8840f468313 100644
--- a/TAO/tao/Messaging/TAO_ExtC.h
+++ b/TAO/tao/Messaging/TAO_ExtC.h
@@ -40,7 +40,6 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "messaging_export.h"
-#include "tao/CDR.h"
#include "tao/Environment.h"
#include "tao/Object.h"
#include "tao/Objref_VarOut_T.h"
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 24eddb191ed..cae4150604a 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -11,7 +11,7 @@
* using the following command:
*
* tao_idl.exe
- * -o orig -Gp -Gd -Ge 1 -GT
+ * -o orig -Gp -Gd -Ge 1 -GT -Sc
* -I$(TAO_ROOT)
* -Wb,export_macro=TAO_ORT_Export
* -Wb,export_include=ort_export.h
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index a4b1561873c..6dbae78e6e8 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -26,10 +26,11 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
// TAO_IDL - Generated from
-// be/be_codegen.cpp:302
+// be\be_codegen.cpp:323
#include "ObjectReferenceTemplateC.h"
+#include "tao/CDR.h"
#include "tao/Exception_Data.h"
#include "tao/Invocation_Adapter.h"
#include "tao/Valuetype/ValueFactory.h"
@@ -49,18 +50,18 @@
#endif /* !defined INLINE */
// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
+// be\be_visitor_arg_traits.cpp:64
// Arg traits specializations.
namespace TAO
{
-
+
// TAO_IDL - Generated from
- // be/be_visitor_arg_traits.cpp:263
+ // be\be_visitor_arg_traits.cpp:379
#if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
#define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
-
+
ACE_TEMPLATE_SPECIALIZATION
class TAO_ORT_Export Arg_Traits<CORBA::StringSeq>
: public
@@ -75,34 +76,35 @@ namespace TAO
#endif /* end #if !defined */
}
+
// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
59,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63745265),
- ACE_NTOHL (0x66657265),
- ACE_NTOHL (0x6e636546),
- ACE_NTOHL (0x6163746f),
- ACE_NTOHL (0x72793a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63745265),
+ ACE_NTOHL (0x66657265),
+ ACE_NTOHL (0x6e636546),
+ ACE_NTOHL (0x6163746f),
+ ACE_NTOHL (0x72793a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
23,
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63745265),
- ACE_NTOHL (0x66657265),
- ACE_NTOHL (0x6e636546),
- ACE_NTOHL (0x6163746f),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63745265),
+ ACE_NTOHL (0x66657265),
+ ACE_NTOHL (0x6e636546),
+ ACE_NTOHL (0x6163746f),
ACE_NTOHL (0x72790000), // name = ObjectReferenceFactory
2, // value modifier
CORBA::tk_null, // no stateful base valuetype
@@ -125,8 +127,9 @@ namespace PortableInterceptor
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:66
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
void
TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_add_ref (
PortableInterceptor::ObjectReferenceFactory * p
@@ -135,6 +138,7 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_add_ref (
CORBA::add_ref (p);
}
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
void
TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_remove_ref (
PortableInterceptor::ObjectReferenceFactory * p
@@ -143,6 +147,15 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_remove_ref (
CORBA::remove_ref (p);
}
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>::tao_release (
+ PortableInterceptor::ObjectReferenceFactory * p
+ )
+{
+ CORBA::remove_ref (p);
+}
+
PortableInterceptor::ObjectReferenceFactory *
PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
{
@@ -150,8 +163,8 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
{
return 0;
}
-
- return dynamic_cast<PortableInterceptor::ObjectReferenceFactory *> (v);
+
+ return dynamic_cast< ::PortableInterceptor::ObjectReferenceFactory * > (v);
}
const char *
@@ -159,6 +172,7 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id (void) const
{
return this->_tao_obv_static_repository_id ();
}
+
void
PortableInterceptor::ObjectReferenceFactory::_tao_any_destructor (void *_tao_void_pointer)
{
@@ -184,29 +198,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
base,
ObjectReferenceFactory::_tao_obv_static_repository_id ()
);
-
+
if (retval == 0)
{
return 0;
}
-
+
if (factory.in () != 0)
{
base = factory->create_for_unmarshal ();
-
+
if (base == 0)
{
return 0; // %! except.?
}
-
+
retval = base->_tao_unmarshal_v (strm);
-
+
if (retval == 0)
{
return 0;
}
}
-
+
// Now base must be null or point to the unmarshaled object.
// Align the pointer to the right subobject.
new_object = ObjectReferenceFactory::_downcast (base);
@@ -214,33 +228,33 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
}
// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
60,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63745265),
- ACE_NTOHL (0x66657265),
- ACE_NTOHL (0x6e636554),
- ACE_NTOHL (0x656d706c),
- ACE_NTOHL (0x6174653a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63745265),
+ ACE_NTOHL (0x66657265),
+ ACE_NTOHL (0x6e636554),
+ ACE_NTOHL (0x656d706c),
+ ACE_NTOHL (0x6174653a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
24,
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63745265),
- ACE_NTOHL (0x66657265),
- ACE_NTOHL (0x6e636554),
- ACE_NTOHL (0x656d706c),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63745265),
+ ACE_NTOHL (0x66657265),
+ ACE_NTOHL (0x6e636554),
+ ACE_NTOHL (0x656d706c),
ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate
2, // value modifier
CORBA::tk_null, // no stateful base valuetype
@@ -263,8 +277,9 @@ namespace PortableInterceptor
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:66
+// be\be_visitor_valuetype/valuetype_cs.cpp:66
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
void
TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_add_ref (
PortableInterceptor::ObjectReferenceTemplate * p
@@ -273,6 +288,7 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_add_ref (
CORBA::add_ref (p);
}
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
void
TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_remove_ref (
PortableInterceptor::ObjectReferenceTemplate * p
@@ -281,6 +297,15 @@ TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_remove_ref
CORBA::remove_ref (p);
}
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>::tao_release (
+ PortableInterceptor::ObjectReferenceTemplate * p
+ )
+{
+ CORBA::remove_ref (p);
+}
+
PortableInterceptor::ObjectReferenceTemplate *
PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
{
@@ -288,8 +313,8 @@ PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
{
return 0;
}
-
- return dynamic_cast<PortableInterceptor::ObjectReferenceTemplate *> (v);
+
+ return dynamic_cast< ::PortableInterceptor::ObjectReferenceTemplate * > (v);
}
const char *
@@ -297,6 +322,7 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id (void) cons
{
return this->_tao_obv_static_repository_id ();
}
+
void
PortableInterceptor::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
{
@@ -322,37 +348,37 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
base,
ObjectReferenceTemplate::_tao_obv_static_repository_id ()
);
-
+
if (retval == 0)
{
return 0;
}
-
+
if (factory.in () != 0)
{
base = factory->create_for_unmarshal ();
-
+
if (base == 0)
{
return 0; // %! except.?
}
-
+
retval = base->_tao_unmarshal_v (strm);
-
+
if (retval == 0)
{
return 0;
}
}
-
+
// Now base must be null or point to the unmarshaled object.
// Align the pointer to the right subobject.
new_object = ObjectReferenceTemplate::_downcast (base);
return retval;
}
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:66
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/sequence_cs.cpp:65
#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
@@ -408,35 +434,35 @@ void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (
#endif /* end #if !defined */
// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
63,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63745265),
- ACE_NTOHL (0x66657265),
- ACE_NTOHL (0x6e636554),
- ACE_NTOHL (0x656d706c),
- ACE_NTOHL (0x61746553),
- ACE_NTOHL (0x65713a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63745265),
+ ACE_NTOHL (0x66657265),
+ ACE_NTOHL (0x6e636554),
+ ACE_NTOHL (0x656d706c),
+ ACE_NTOHL (0x61746553),
+ ACE_NTOHL (0x65713a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
27,
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63745265),
- ACE_NTOHL (0x66657265),
- ACE_NTOHL (0x6e636554),
- ACE_NTOHL (0x656d706c),
- ACE_NTOHL (0x61746553),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63745265),
+ ACE_NTOHL (0x66657265),
+ ACE_NTOHL (0x6e636554),
+ ACE_NTOHL (0x656d706c),
+ ACE_NTOHL (0x61746553),
ACE_NTOHL (0x65710000), // name = ObjectReferenceTemplateSeq
CORBA::tk_sequence, // typecode kind
124, // encapsulation length
@@ -445,33 +471,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
480, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
60,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63745265),
- ACE_NTOHL (0x66657265),
- ACE_NTOHL (0x6e636554),
- ACE_NTOHL (0x656d706c),
- ACE_NTOHL (0x6174653a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63745265),
+ ACE_NTOHL (0x66657265),
+ ACE_NTOHL (0x6e636554),
+ ACE_NTOHL (0x656d706c),
+ ACE_NTOHL (0x6174653a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
24,
- ACE_NTOHL (0x4f626a65),
- ACE_NTOHL (0x63745265),
- ACE_NTOHL (0x66657265),
- ACE_NTOHL (0x6e636554),
- ACE_NTOHL (0x656d706c),
+ ACE_NTOHL (0x4f626a65),
+ ACE_NTOHL (0x63745265),
+ ACE_NTOHL (0x66657265),
+ ACE_NTOHL (0x6e636554),
+ ACE_NTOHL (0x656d706c),
ACE_NTOHL (0x61746500), // name = ObjectReferenceTemplate
2, // value modifier
CORBA::tk_null, // no stateful base valuetype
3, // member count
-
+
0U,
};
@@ -491,31 +517,31 @@ namespace PortableInterceptor
}
// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
53,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x41646170),
- ACE_NTOHL (0x7465724d),
- ACE_NTOHL (0x616e6167),
- ACE_NTOHL (0x65724964),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x41646170),
+ ACE_NTOHL (0x7465724d),
+ ACE_NTOHL (0x616e6167),
+ ACE_NTOHL (0x65724964),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0
17,
- ACE_NTOHL (0x41646170),
- ACE_NTOHL (0x7465724d),
- ACE_NTOHL (0x616e6167),
- ACE_NTOHL (0x65724964),
+ ACE_NTOHL (0x41646170),
+ ACE_NTOHL (0x7465724d),
+ ACE_NTOHL (0x616e6167),
+ ACE_NTOHL (0x65724964),
ACE_NTOHL (0x0), // name = AdapterManagerId
CORBA::tk_long,
@@ -536,29 +562,29 @@ namespace PortableInterceptor
}
// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
49,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x506f7274),
- ACE_NTOHL (0x61626c65),
- ACE_NTOHL (0x496e7465),
- ACE_NTOHL (0x72636570),
- ACE_NTOHL (0x746f722f),
- ACE_NTOHL (0x41646170),
- ACE_NTOHL (0x74657253),
- ACE_NTOHL (0x74617465),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x506f7274),
+ ACE_NTOHL (0x61626c65),
+ ACE_NTOHL (0x496e7465),
+ ACE_NTOHL (0x72636570),
+ ACE_NTOHL (0x746f722f),
+ ACE_NTOHL (0x41646170),
+ ACE_NTOHL (0x74657253),
+ ACE_NTOHL (0x74617465),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0
13,
- ACE_NTOHL (0x41646170),
- ACE_NTOHL (0x74657253),
- ACE_NTOHL (0x74617465),
+ ACE_NTOHL (0x41646170),
+ ACE_NTOHL (0x74657253),
+ ACE_NTOHL (0x74617465),
ACE_NTOHL (0x0), // name = AdapterState
CORBA::tk_short,
@@ -579,7 +605,8 @@ namespace PortableInterceptor
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:57
+// be\be_visitor_valuetype/any_op_cs.cpp:57
+
template<>
@@ -591,8 +618,8 @@ TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value (
CORBA::add_ref (this->value_);
_tao_elem = this->value_;
return 1;
-}// Copying insertion.
-
+}
+// Copying insertion.
void
operator<<= (
CORBA::Any &_tao_any,
@@ -636,7 +663,7 @@ operator>>= (
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:57
+// be\be_visitor_valuetype/any_op_cs.cpp:57
@@ -649,7 +676,8 @@ TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
CORBA::add_ref (this->value_);
_tao_elem = this->value_;
return 1;
-}// Copying insertion.
+}
+// Copying insertion.
void
operator<<= (
CORBA::Any &_tao_any,
@@ -692,8 +720,8 @@ operator>>= (
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_cs.cpp:54
// Copying insertion.
void operator<<= (
@@ -751,7 +779,7 @@ CORBA::Boolean operator>>= (
}
// TAO_IDL - Generated from
-// be/be_valuetype.cpp:490
+// be\be_valuetype.cpp:490
void
CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
@@ -772,7 +800,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt)
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_cs.cpp:73
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
CORBA::Boolean
operator<< (
@@ -803,7 +831,7 @@ operator>> (
// TAO_IDL - Generated from
-// be/be_valuetype.cpp:490
+// be\be_valuetype.cpp:490
void
CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
@@ -824,7 +852,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_cs.cpp:73
+// be\be_visitor_valuetype/cdr_op_cs.cpp:73
CORBA::Boolean
operator<< (
@@ -855,7 +883,7 @@ operator>> (
// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
#if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
#define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
@@ -866,20 +894,20 @@ CORBA::Boolean operator<< (
)
{
CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+
if (strm << _tao_seq_len)
{
// Encode all elements.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm << _tao_sequence[i].in ());
}
-
+
return _tao_marshal_flag;
}
-
+
return 0;
}
@@ -889,7 +917,7 @@ CORBA::Boolean operator>> (
)
{
CORBA::ULong _tao_seq_len;
-
+
if (strm >> _tao_seq_len)
{
// Add a check to the length of the sequence
@@ -899,35 +927,35 @@ CORBA::Boolean operator>> (
{
return 0;
}
-
+
// Set the length of the sequence.
_tao_sequence.length (_tao_seq_len);
-
+
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
{
return 1;
}
-
+
// Retrieve all the elements.
CORBA::Boolean _tao_marshal_flag = 1;
-
+
for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
{
_tao_marshal_flag = (strm >> _tao_sequence[i].out ());
}
-
+
return _tao_marshal_flag;
-
+
}
-
+
return 0;
}
#endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */
// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1702
+// be\be_visitor_root/root.cpp:1628
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -945,18 +973,21 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
- template class TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>;
+ template class
+ TAO::Value_Traits<
+ PortableInterceptor::ObjectReferenceFactory
+ >;
template class
TAO_Value_Var_T<
PortableInterceptor::ObjectReferenceFactory
-
+
>;
-
+
template class
TAO_Value_Out_T<
PortableInterceptor::ObjectReferenceFactory
-
+
>;
template class
@@ -964,18 +995,27 @@ CORBA::Boolean operator>> (
PortableInterceptor::ObjectReferenceFactory
>;
- template class TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>;
+ template class
+ TAO::Ret_Var_Size_Argument_T<
+ PortableInterceptor::AdapterName,
+ PortableInterceptor::AdapterName_var
+ >;
template class
- TAO_Value_Var_T<
+ TAO::Value_Traits<
PortableInterceptor::ObjectReferenceTemplate
-
>;
template class
+ TAO_Value_Var_T<
+ PortableInterceptor::ObjectReferenceTemplate
+
+ >;
+
+ template class
TAO_Value_Out_T<
PortableInterceptor::ObjectReferenceTemplate
-
+
>;
template class
@@ -1017,8 +1057,8 @@ CORBA::Boolean operator>> (
>
>;
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ__EXPLICIT_CS_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ__EXPLICIT_CS_
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__EXPLICIT_CS_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__EXPLICIT_CS_
template class
TAO_Unbounded_Valuetype_Sequence<
@@ -1049,18 +1089,21 @@ CORBA::Boolean operator>> (
#endif /* end #if !defined */
-# pragma instantiate TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>
+# pragma instantiate \
+ TAO::Value_Traits< \
+ PortableInterceptor::ObjectReferenceFactory \
+ >
# pragma instantiate \
TAO_Value_Var_T< \
PortableInterceptor::ObjectReferenceFactory \
-
+
>
-
+
# pragma instantiate \
TAO_Value_Out_T< \
PortableInterceptor::ObjectReferenceFactory \
-
+
>
# pragma instantiate \
@@ -1068,18 +1111,21 @@ CORBA::Boolean operator>> (
PortableInterceptor::ObjectReferenceFactory \
>
-# pragma instantiate TAO::Value_Traits<PortableInterceptor::ObjectReferenceTemplate>
+# pragma instantiate \
+ TAO::Value_Traits< \
+ PortableInterceptor::ObjectReferenceTemplate \
+ >
# pragma instantiate \
TAO_Value_Var_T< \
PortableInterceptor::ObjectReferenceTemplate \
-
+
>
-
+
# pragma instantiate \
TAO_Value_Out_T< \
PortableInterceptor::ObjectReferenceTemplate \
-
+
>
# pragma instantiate \
@@ -1115,8 +1161,8 @@ CORBA::Boolean operator>> (
> \
>
-#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ__EXPLICIT_CS_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ__EXPLICIT_CS_
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__EXPLICIT_CS_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__EXPLICIT_CS_
# pragma instantiate \
TAO_Unbounded_Valuetype_Sequence< \
@@ -1131,4 +1177,5 @@ CORBA::Boolean operator>> (
PortableInterceptor::ObjectReferenceTemplateSeq \
>
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
index f0911270dfa..3e4798bd919 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -26,7 +26,7 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
// TAO_IDL - Generated from
-// be/be_codegen.cpp:150
+// be\be_codegen.cpp:171
#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
@@ -40,7 +40,6 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ort_export.h"
-#include "tao/CDR.h"
#include "tao/Environment.h"
#include "tao/Object.h"
#include "tao/Valuetype/ValueBase.h"
@@ -77,26 +76,26 @@
#endif /* __BORLANDC__ */
// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
namespace PortableInterceptor
{
-
+
// TAO_IDL - Generated from
- // be/be_valuetype.cpp:527
-
-
+ // be\be_valuetype.cpp:527
+
+
#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_)
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__VAR_OUT_CH_
-
+
class ObjectReferenceFactory;
typedef
TAO_Value_Var_T<
ObjectReferenceFactory
>
ObjectReferenceFactory_var;
-
+
typedef
TAO_Value_Out_T<
ObjectReferenceFactory
@@ -104,78 +103,78 @@ namespace PortableInterceptor
ObjectReferenceFactory_out;
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
- // be/be_visitor_valuetype/valuetype_ch.cpp:56
+ // be\be_visitor_valuetype/valuetype_ch.cpp:56
#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
-
+
class TAO_ORT_Export ObjectReferenceFactory
: public virtual CORBA::ValueBase
{
public:
typedef ObjectReferenceFactory_var _var_type;
-
+
static ObjectReferenceFactory* _downcast (CORBA::ValueBase *);
-
+
// (TAO extensions or internals)
static CORBA::Boolean _tao_unmarshal (
TAO_InputCDR &,
ObjectReferenceFactory *&
);
-
+
virtual const char* _tao_obv_repository_id (void) const;
-
+
static const char* _tao_obv_static_repository_id (void);
-
+
static void _tao_any_destructor (void *);
-
+
// TAO_IDL - Generated from
- // be/be_visitor_valuetype/valuetype_ch.cpp:401
-
+ // be\be_visitor_valuetype/valuetype_ch.cpp:401
+
public:
virtual CORBA::Object_ptr make_object (
const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
) = 0;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_valuetype/valuetype_ch.cpp:250
-
+ // be\be_visitor_valuetype/valuetype_ch.cpp:250
+
protected:
ObjectReferenceFactory (void);
-
+
virtual ~ObjectReferenceFactory (void);
-
-
+
+
private:
ObjectReferenceFactory (const ObjectReferenceFactory &);
void operator= (const ObjectReferenceFactory &);
-
+
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
- // be/be_visitor_typecode/typecode_decl.cpp:44
-
+ // be\be_visitor_typecode/typecode_decl.cpp:44
+
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-
+
// TAO_IDL - Generated from
- // be/be_valuetype.cpp:527
-
-
+ // be\be_valuetype.cpp:527
+
+
#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
-
+
class ObjectReferenceTemplate;
typedef
TAO_Value_Var_T<
ObjectReferenceTemplate
>
ObjectReferenceTemplate_var;
-
+
typedef
TAO_Value_Out_T<
ObjectReferenceTemplate
@@ -183,87 +182,87 @@ namespace PortableInterceptor
ObjectReferenceTemplate_out;
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
- // be/be_visitor_valuetype/valuetype_ch.cpp:56
+ // be\be_visitor_valuetype/valuetype_ch.cpp:56
#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
-
+
class TAO_ORT_Export ObjectReferenceTemplate
: public virtual ObjectReferenceFactory
{
public:
typedef ObjectReferenceTemplate_var _var_type;
-
+
static ObjectReferenceTemplate* _downcast (CORBA::ValueBase *);
-
+
// (TAO extensions or internals)
static CORBA::Boolean _tao_unmarshal (
TAO_InputCDR &,
ObjectReferenceTemplate *&
);
-
+
virtual const char* _tao_obv_repository_id (void) const;
-
+
static const char* _tao_obv_static_repository_id (void);
-
+
static void _tao_any_destructor (void *);
-
+
// TAO_IDL - Generated from
- // be/be_visitor_valuetype/valuetype_ch.cpp:401
-
+ // be\be_visitor_valuetype/valuetype_ch.cpp:401
+
public:
virtual char * server_id (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
) = 0;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_valuetype/valuetype_ch.cpp:401
-
+ // be\be_visitor_valuetype/valuetype_ch.cpp:401
+
public:
virtual char * orb_id (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
) = 0;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_valuetype/valuetype_ch.cpp:401
-
+ // be\be_visitor_valuetype/valuetype_ch.cpp:401
+
public:
virtual ::PortableInterceptor::AdapterName * adapter_name (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
) = 0;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_valuetype/valuetype_ch.cpp:250
-
+ // be\be_visitor_valuetype/valuetype_ch.cpp:250
+
protected:
ObjectReferenceTemplate (void);
-
+
virtual ~ObjectReferenceTemplate (void);
-
-
+
+
private:
ObjectReferenceTemplate (const ObjectReferenceTemplate &);
void operator= (const ObjectReferenceTemplate &);
-
+
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
- // be/be_visitor_typecode/typecode_decl.cpp:44
-
+ // be\be_visitor_typecode/typecode_decl.cpp:44
+
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_sequence/sequence_ch.cpp:101
+ // be\be_visitor_sequence/sequence_ch.cpp:101
#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
-
+
class ObjectReferenceTemplateSeq;
-
+
typedef
TAO_MngSeq_Var_T<
ObjectReferenceTemplateSeq,
@@ -273,7 +272,7 @@ namespace PortableInterceptor
>
>
ObjectReferenceTemplateSeq_var;
-
+
typedef
TAO_MngSeq_Out_T<
ObjectReferenceTemplateSeq,
@@ -284,7 +283,7 @@ namespace PortableInterceptor
>
>
ObjectReferenceTemplateSeq_out;
-
+
class TAO_ORT_Export ObjectReferenceTemplateSeq
: public
TAO_Unbounded_Valuetype_Sequence<
@@ -298,85 +297,85 @@ namespace PortableInterceptor
ObjectReferenceTemplateSeq (
CORBA::ULong max,
CORBA::ULong length,
- ObjectReferenceTemplate ** buffer,
+ ObjectReferenceTemplate ** buffer,
CORBA::Boolean release = 0
);
ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
~ObjectReferenceTemplateSeq (void);
-
+
static void _tao_any_destructor (void *);
-
+
typedef ObjectReferenceTemplateSeq_var _var_type;
};
#endif /* end #if !defined */
-
+
// TAO_IDL - Generated from
- // be/be_visitor_typecode/typecode_decl.cpp:44
-
+ // be\be_visitor_typecode/typecode_decl.cpp:44
+
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_typedef/typedef_ch.cpp:342
-
+ // be\be_visitor_typedef/typedef_ch.cpp:342
+
typedef CORBA::Long AdapterManagerId;
typedef CORBA::Long_out AdapterManagerId_out;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_typecode/typecode_decl.cpp:44
-
+ // be\be_visitor_typecode/typecode_decl.cpp:44
+
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_typedef/typedef_ch.cpp:342
-
+ // be\be_visitor_typedef/typedef_ch.cpp:342
+
typedef CORBA::Short AdapterState;
typedef CORBA::Short_out AdapterState_out;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_typecode/typecode_decl.cpp:44
-
+ // be\be_visitor_typecode/typecode_decl.cpp:44
+
TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_constant/constant_ch.cpp:52
-
+ // be\be_visitor_constant/constant_ch.cpp:52
+
const PortableInterceptor::AdapterState HOLDING = 0;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_constant/constant_ch.cpp:52
-
+ // be\be_visitor_constant/constant_ch.cpp:52
+
const PortableInterceptor::AdapterState ACTIVE = 1;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_constant/constant_ch.cpp:52
-
+ // be\be_visitor_constant/constant_ch.cpp:52
+
const PortableInterceptor::AdapterState DISCARDING = 2;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_constant/constant_ch.cpp:52
-
+ // be\be_visitor_constant/constant_ch.cpp:52
+
const PortableInterceptor::AdapterState INACTIVE = 3;
-
+
// TAO_IDL - Generated from
- // be/be_visitor_constant/constant_ch.cpp:52
-
+ // be\be_visitor_constant/constant_ch.cpp:52
+
const PortableInterceptor::AdapterState NON_EXISTENT = 4;
// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
} // module PortableInterceptor
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/obv_module.cpp:55
+// be\be_visitor_valuetype/obv_module.cpp:55
namespace OBV_PortableInterceptor
{
}
// TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:48
+// be\be_visitor_traits.cpp:59
// Traits specializations.
namespace TAO
@@ -384,45 +383,47 @@ namespace TAO
#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_)
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__TRAITS_CH_
-
+
ACE_TEMPLATE_SPECIALIZATION
struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceFactory>
{
static void tao_add_ref (PortableInterceptor::ObjectReferenceFactory *);
static void tao_remove_ref (PortableInterceptor::ObjectReferenceFactory *);
+ static void tao_release (PortableInterceptor::ObjectReferenceFactory *);
};
#endif /* end #if !defined */
#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_)
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__TRAITS_CH_
-
+
ACE_TEMPLATE_SPECIALIZATION
struct TAO_ORT_Export Value_Traits<PortableInterceptor::ObjectReferenceTemplate>
{
static void tao_add_ref (PortableInterceptor::ObjectReferenceTemplate *);
static void tao_remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
+ static void tao_release (PortableInterceptor::ObjectReferenceTemplate *);
};
#endif /* end #if !defined */
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_ch.cpp:54
+// be\be_visitor_valuetype/any_op_ch.cpp:54
TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_ch.cpp:54
+// be\be_visitor_valuetype/any_op_ch.cpp:54
TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
TAO_ORT_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
@@ -430,12 +431,7 @@ TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableIntercept
TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_valuetype.cpp:434
+// be\be_valuetype.cpp:434
namespace CORBA
{
@@ -444,13 +440,13 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ch.cpp:61
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
// TAO_IDL - Generated from
-// be/be_valuetype.cpp:434
+// be\be_valuetype.cpp:434
namespace CORBA
{
@@ -459,13 +455,13 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ch.cpp:61
+// be\be_visitor_valuetype/cdr_op_ch.cpp:61
TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
#if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
#define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
@@ -482,12 +478,7 @@ TAO_ORT_Export CORBA::Boolean operator>> (
#endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_ */
// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:911
+// be\be_codegen.cpp:978
#if defined (__ACE_INLINE__)
#include "ObjectReferenceTemplateC.i"
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i
index ce046f2c9fd..1185feac15c 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i
@@ -27,7 +27,7 @@
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_ci.cpp:56
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
ACE_INLINE
PortableInterceptor::ObjectReferenceFactory::ObjectReferenceFactory (void)
@@ -44,7 +44,7 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
}
// TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_ci.cpp:56
+// be\be_visitor_valuetype/valuetype_ci.cpp:56
ACE_INLINE
PortableInterceptor::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
@@ -60,59 +60,3 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
}
-// TAO_IDL - Generated from
-// be/be_valuetype.cpp:463
-
-#if defined (__ACE_INLINE__)
-
-namespace CORBA
-{
- TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceFactory *);
- TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceFactory *);
-}
-
-#endif /*__ACE_INLINE__*/
-
-// TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ci.cpp:60
-
-TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
-TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
-
-// TAO_IDL - Generated from
-// be/be_valuetype.cpp:463
-
-#if defined (__ACE_INLINE__)
-
-namespace CORBA
-{
- TAO_NAMESPACE_STORAGE_CLASS void add_ref (PortableInterceptor::ObjectReferenceTemplate *);
- TAO_NAMESPACE_STORAGE_CLASS void remove_ref (PortableInterceptor::ObjectReferenceTemplate *);
-}
-
-#endif /*__ACE_INLINE__*/
-
-// TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ci.cpp:60
-
-TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
-TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_
-#define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_
-
-CORBA::Boolean TAO_ORT_Export operator<< (
- TAO_OutputCDR &,
- const PortableInterceptor::ObjectReferenceTemplateSeq &
- );
-
-CORBA::Boolean TAO_ORT_Export operator>> (
- TAO_InputCDR &,
- PortableInterceptor::ObjectReferenceTemplateSeq &
- );
-
-#endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_ */
-
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index cefc96b533f..c2bd94a1566 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -7,6 +7,7 @@
#include "tao/ORB_Core.h"
#include "tao/Policy_Manager.h"
#include "tao/debug.h"
+#include "tao/CDR.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index e18d2c58955..a99e56acc07 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -18,6 +18,7 @@
#include "tao/Policy_Set.h"
#include "tao/IIOP_Transport.h"
#include "tao/debug.h"
+#include "tao/CDR.h"
#include "ace/Dynamic_Service.h"
#include "ace/OS_NS_string.h"
View Lorry Controller Status