summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog11
-rw-r--r--TAO/tao/Makefile.am6
-rw-r--r--TAO/tao/ServicesA.cpp555
-rw-r--r--TAO/tao/ServicesC.cpp23
-rw-r--r--TAO/tao/ServicesC.h17
-rw-r--r--TAO/tao/ServicesC.inl (renamed from TAO/tao/ServicesS.i)1
-rw-r--r--TAO/tao/ServicesS.cpp33
-rw-r--r--TAO/tao/ServicesS.h16
-rw-r--r--TAO/tao/ServicesS.inl (renamed from TAO/tao/ServicesS_T.i)1
-rw-r--r--TAO/tao/ServicesS_T.cpp7
-rw-r--r--TAO/tao/ServicesS_T.h13
-rw-r--r--TAO/tao/ServicesS_T.inl (renamed from TAO/tao/ServicesC.i)0
12 files changed, 332 insertions, 351 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b5354b56405..613cdeadc16 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Sun Dec 12 13:28:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/ServicesC.{h,cpp,i,inl}:
+ * tao/ServicesS.{h,cpp,i,inl}:
+ * tao/ServicesS_T.{h,cpp,i,inl}:
+ * tao/DomainA.cpp:
+ Regenerated and replace .i file with .inl variant
+
+ * tao/Makefile.am:
+ Updated because of change above
+
Sun Dec 12 13:01:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/StringSeqC.{h,cpp}:
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index e623a99dc59..0e1d06d1bac 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -814,9 +814,9 @@ nobase_include_HEADERS += \
Sequence_T.i \
Service_Callbacks.i \
Service_Context.inl \
- ServicesC.i \
- ServicesS.i \
- ServicesS_T.i \
+ ServicesC.inl \
+ ServicesS.inl \
+ ServicesS_T.inl \
ShortSeqC.i \
Special_Basic_Argument_T.inl \
Special_Basic_SArgument_T.inl \
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
index 564a5af65c2..3ba20f81ae4 100644
--- a/TAO/tao/ServicesA.cpp
+++ b/TAO/tao/ServicesA.cpp
@@ -27,27 +27,29 @@
#include "ServicesC.h"
#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
#include "tao/Any_Dual_Impl_T.h"
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
static const CORBA::Long _oc_CORBA_ServiceType[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
34,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65547970),
- ACE_NTOHL (0x653a312e),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65547970),
+ ACE_NTOHL (0x653a312e),
ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/ServiceType:1.0
12,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636554),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636554),
ACE_NTOHL (0x79706500), // name = ServiceType
CORBA::tk_ushort,
@@ -58,7 +60,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType (
sizeof (_oc_CORBA_ServiceType),
(char *) &_oc_CORBA_ServiceType,
0,
- sizeof (CORBA::ServiceType)
+ 0
);
namespace CORBA
@@ -68,25 +70,25 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
static const CORBA::Long _oc_CORBA_ServiceOption[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x654f7074),
- ACE_NTOHL (0x696f6e3a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x654f7074),
+ ACE_NTOHL (0x696f6e3a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
14,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x6963654f),
- ACE_NTOHL (0x7074696f),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x6963654f),
+ ACE_NTOHL (0x7074696f),
ACE_NTOHL (0x6e000000), // name = ServiceOption
CORBA::tk_ulong,
@@ -97,7 +99,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption (
sizeof (_oc_CORBA_ServiceOption),
(char *) &_oc_CORBA_ServiceOption,
0,
- sizeof (CORBA::ServiceOption)
+ 0
);
namespace CORBA
@@ -107,27 +109,27 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c54),
- ACE_NTOHL (0x7970653a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c54),
+ ACE_NTOHL (0x7970653a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
18,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
- ACE_NTOHL (0x6c547970),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x6c547970),
ACE_NTOHL (0x65000000), // name = ServiceDetailType
CORBA::tk_ulong,
@@ -138,7 +140,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType (
sizeof (_oc_CORBA_ServiceDetailType),
(char *) &_oc_CORBA_ServiceDetailType,
0,
- sizeof (CORBA::ServiceDetailType)
+ 0
);
namespace CORBA
@@ -148,76 +150,76 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
static const CORBA::Long _oc_CORBA_ServiceDetail[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c3a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c3a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
14,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
ACE_NTOHL (0x6c000000), // name = ServiceDetail
2, // member count
20,
- ACE_NTOHL (0x73657276),
- ACE_NTOHL (0x6963655f),
- ACE_NTOHL (0x64657461),
- ACE_NTOHL (0x696c5f74),
+ ACE_NTOHL (0x73657276),
+ ACE_NTOHL (0x6963655f),
+ ACE_NTOHL (0x64657461),
+ ACE_NTOHL (0x696c5f74),
ACE_NTOHL (0x79706500), // name = service_detail_type
CORBA::tk_alias, // typecode kind for typedefs
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c54),
- ACE_NTOHL (0x7970653a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c54),
+ ACE_NTOHL (0x7970653a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
18,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
- ACE_NTOHL (0x6c547970),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x6c547970),
ACE_NTOHL (0x65000000), // name = ServiceDetailType
CORBA::tk_ulong,
15,
- ACE_NTOHL (0x73657276),
- ACE_NTOHL (0x6963655f),
- ACE_NTOHL (0x64657461),
+ ACE_NTOHL (0x73657276),
+ ACE_NTOHL (0x6963655f),
+ ACE_NTOHL (0x64657461),
ACE_NTOHL (0x696c0000), // name = service_detail
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
@@ -234,7 +236,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail (
sizeof (_oc_CORBA_ServiceDetail),
(char *) &_oc_CORBA_ServiceDetail,
0,
- sizeof (CORBA::ServiceDetail)
+ 0
);
namespace CORBA
@@ -244,27 +246,27 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
static const CORBA::Long _oc_CORBA_ServiceOptionSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
39,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x654f7074),
- ACE_NTOHL (0x696f6e53),
- ACE_NTOHL (0x65713a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x654f7074),
+ ACE_NTOHL (0x696f6e53),
+ ACE_NTOHL (0x65713a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ServiceOptionSeq:1.0
17,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x6963654f),
- ACE_NTOHL (0x7074696f),
- ACE_NTOHL (0x6e536571),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x6963654f),
+ ACE_NTOHL (0x7074696f),
+ ACE_NTOHL (0x6e536571),
ACE_NTOHL (0x0), // name = ServiceOptionSeq
CORBA::tk_sequence, // typecode kind
84, // encapsulation length
@@ -273,19 +275,19 @@ static const CORBA::Long _oc_CORBA_ServiceOptionSeq[] =
68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x654f7074),
- ACE_NTOHL (0x696f6e3a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x654f7074),
+ ACE_NTOHL (0x696f6e3a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
14,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x6963654f),
- ACE_NTOHL (0x7074696f),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x6963654f),
+ ACE_NTOHL (0x7074696f),
ACE_NTOHL (0x6e000000), // name = ServiceOption
CORBA::tk_ulong,
@@ -299,7 +301,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOptionSeq (
sizeof (_oc_CORBA_ServiceOptionSeq),
(char *) &_oc_CORBA_ServiceOptionSeq,
0,
- sizeof (CORBA::ServiceOptionSeq)
+ 0
);
namespace CORBA
@@ -309,27 +311,27 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
static const CORBA::Long _oc_CORBA_ServiceDetailSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
39,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c53),
- ACE_NTOHL (0x65713a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c53),
+ ACE_NTOHL (0x65713a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ServiceDetailSeq:1.0
17,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
- ACE_NTOHL (0x6c536571),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x6c536571),
ACE_NTOHL (0x0), // name = ServiceDetailSeq
CORBA::tk_sequence, // typecode kind
296, // encapsulation length
@@ -338,70 +340,70 @@ static const CORBA::Long _oc_CORBA_ServiceDetailSeq[] =
280, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c3a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c3a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
14,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
ACE_NTOHL (0x6c000000), // name = ServiceDetail
2, // member count
20,
- ACE_NTOHL (0x73657276),
- ACE_NTOHL (0x6963655f),
- ACE_NTOHL (0x64657461),
- ACE_NTOHL (0x696c5f74),
+ ACE_NTOHL (0x73657276),
+ ACE_NTOHL (0x6963655f),
+ ACE_NTOHL (0x64657461),
+ ACE_NTOHL (0x696c5f74),
ACE_NTOHL (0x79706500), // name = service_detail_type
CORBA::tk_alias, // typecode kind for typedefs
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c54),
- ACE_NTOHL (0x7970653a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c54),
+ ACE_NTOHL (0x7970653a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
18,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
- ACE_NTOHL (0x6c547970),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x6c547970),
ACE_NTOHL (0x65000000), // name = ServiceDetailType
CORBA::tk_ulong,
15,
- ACE_NTOHL (0x73657276),
- ACE_NTOHL (0x6963655f),
- ACE_NTOHL (0x64657461),
+ ACE_NTOHL (0x73657276),
+ ACE_NTOHL (0x6963655f),
+ ACE_NTOHL (0x64657461),
ACE_NTOHL (0x696c0000), // name = service_detail
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
@@ -421,7 +423,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailSeq (
sizeof (_oc_CORBA_ServiceDetailSeq),
(char *) &_oc_CORBA_ServiceDetailSeq,
0,
- sizeof (CORBA::ServiceDetailSeq)
+ 0
);
namespace CORBA
@@ -431,54 +433,54 @@ namespace CORBA
}
// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
static const CORBA::Long _oc_CORBA_ServiceInformation[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
41,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65496e66),
- ACE_NTOHL (0x6f726d61),
- ACE_NTOHL (0x74696f6e),
- ACE_NTOHL (0x3a312e30),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65496e66),
+ ACE_NTOHL (0x6f726d61),
+ ACE_NTOHL (0x74696f6e),
+ ACE_NTOHL (0x3a312e30),
ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
19,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636549),
- ACE_NTOHL (0x6e666f72),
- ACE_NTOHL (0x6d617469),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636549),
+ ACE_NTOHL (0x6e666f72),
+ ACE_NTOHL (0x6d617469),
ACE_NTOHL (0x6f6e0000), // name = ServiceInformation
2, // member count
16,
- ACE_NTOHL (0x73657276),
- ACE_NTOHL (0x6963655f),
- ACE_NTOHL (0x6f707469),
+ ACE_NTOHL (0x73657276),
+ ACE_NTOHL (0x6963655f),
+ ACE_NTOHL (0x6f707469),
ACE_NTOHL (0x6f6e7300), // name = service_options
CORBA::tk_alias, // typecode kind for typedefs
164, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
39,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x654f7074),
- ACE_NTOHL (0x696f6e53),
- ACE_NTOHL (0x65713a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x654f7074),
+ ACE_NTOHL (0x696f6e53),
+ ACE_NTOHL (0x65713a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ServiceOptionSeq:1.0
17,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x6963654f),
- ACE_NTOHL (0x7074696f),
- ACE_NTOHL (0x6e536571),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x6963654f),
+ ACE_NTOHL (0x7074696f),
+ ACE_NTOHL (0x6e536571),
ACE_NTOHL (0x0), // name = ServiceOptionSeq
CORBA::tk_sequence, // typecode kind
84, // encapsulation length
@@ -487,19 +489,19 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] =
68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x654f7074),
- ACE_NTOHL (0x696f6e3a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x654f7074),
+ ACE_NTOHL (0x696f6e3a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
14,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x6963654f),
- ACE_NTOHL (0x7074696f),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x6963654f),
+ ACE_NTOHL (0x7074696f),
ACE_NTOHL (0x6e000000), // name = ServiceOption
CORBA::tk_ulong,
@@ -508,29 +510,29 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] =
16,
- ACE_NTOHL (0x73657276),
- ACE_NTOHL (0x6963655f),
- ACE_NTOHL (0x64657461),
+ ACE_NTOHL (0x73657276),
+ ACE_NTOHL (0x6963655f),
+ ACE_NTOHL (0x64657461),
ACE_NTOHL (0x696c7300), // name = service_details
CORBA::tk_alias, // typecode kind for typedefs
376, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
39,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c53),
- ACE_NTOHL (0x65713a31),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c53),
+ ACE_NTOHL (0x65713a31),
ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ServiceDetailSeq:1.0
17,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
- ACE_NTOHL (0x6c536571),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x6c536571),
ACE_NTOHL (0x0), // name = ServiceDetailSeq
CORBA::tk_sequence, // typecode kind
296, // encapsulation length
@@ -539,70 +541,70 @@ static const CORBA::Long _oc_CORBA_ServiceInformation[] =
280, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
36,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c3a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c3a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
14,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
ACE_NTOHL (0x6c000000), // name = ServiceDetail
2, // member count
20,
- ACE_NTOHL (0x73657276),
- ACE_NTOHL (0x6963655f),
- ACE_NTOHL (0x64657461),
- ACE_NTOHL (0x696c5f74),
+ ACE_NTOHL (0x73657276),
+ ACE_NTOHL (0x6963655f),
+ ACE_NTOHL (0x64657461),
+ ACE_NTOHL (0x696c5f74),
ACE_NTOHL (0x79706500), // name = service_detail_type
CORBA::tk_alias, // typecode kind for typedefs
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40,
- ACE_NTOHL (0x49444c3a),
- ACE_NTOHL (0x6f6d672e),
- ACE_NTOHL (0x6f72672f),
- ACE_NTOHL (0x434f5242),
- ACE_NTOHL (0x412f5365),
- ACE_NTOHL (0x72766963),
- ACE_NTOHL (0x65446574),
- ACE_NTOHL (0x61696c54),
- ACE_NTOHL (0x7970653a),
+ ACE_NTOHL (0x49444c3a),
+ ACE_NTOHL (0x6f6d672e),
+ ACE_NTOHL (0x6f72672f),
+ ACE_NTOHL (0x434f5242),
+ ACE_NTOHL (0x412f5365),
+ ACE_NTOHL (0x72766963),
+ ACE_NTOHL (0x65446574),
+ ACE_NTOHL (0x61696c54),
+ ACE_NTOHL (0x7970653a),
ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
18,
- ACE_NTOHL (0x53657276),
- ACE_NTOHL (0x69636544),
- ACE_NTOHL (0x65746169),
- ACE_NTOHL (0x6c547970),
+ ACE_NTOHL (0x53657276),
+ ACE_NTOHL (0x69636544),
+ ACE_NTOHL (0x65746169),
+ ACE_NTOHL (0x6c547970),
ACE_NTOHL (0x65000000), // name = ServiceDetailType
CORBA::tk_ulong,
15,
- ACE_NTOHL (0x73657276),
- ACE_NTOHL (0x6963655f),
- ACE_NTOHL (0x64657461),
+ ACE_NTOHL (0x73657276),
+ ACE_NTOHL (0x6963655f),
+ ACE_NTOHL (0x64657461),
ACE_NTOHL (0x696c0000), // name = service_detail
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
@@ -623,7 +625,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation (
sizeof (_oc_CORBA_ServiceInformation),
(char *) &_oc_CORBA_ServiceInformation,
0,
- sizeof (CORBA::ServiceInformation)
+ 0
);
namespace CORBA
@@ -632,7 +634,7 @@ namespace CORBA
&_tc_TAO_tc_CORBA_ServiceInformation;
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_structure/any_op_cs.cpp:54
// Copying insertion.
@@ -669,8 +671,8 @@ CORBA::Boolean operator>>= (
CORBA::ServiceDetail *&_tao_elem
)
{
- return _tao_any >>= ACE_const_cast (
- const CORBA::ServiceDetail *&,
+ return _tao_any >>= const_cast<
+ const CORBA::ServiceDetail *&> (
_tao_elem
);
}
@@ -690,7 +692,7 @@ CORBA::Boolean operator>>= (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_sequence/any_op_cs.cpp:54
// Copying insertion.
@@ -727,8 +729,8 @@ CORBA::Boolean operator>>= (
CORBA::ServiceOptionSeq *&_tao_elem
)
{
- return _tao_any >>= ACE_const_cast (
- const CORBA::ServiceOptionSeq *&,
+ return _tao_any >>= const_cast<
+ const CORBA::ServiceOptionSeq *&> (
_tao_elem
);
}
@@ -748,7 +750,7 @@ CORBA::Boolean operator>>= (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_sequence/any_op_cs.cpp:54
// Copying insertion.
@@ -785,8 +787,8 @@ CORBA::Boolean operator>>= (
CORBA::ServiceDetailSeq *&_tao_elem
)
{
- return _tao_any >>= ACE_const_cast (
- const CORBA::ServiceDetailSeq *&,
+ return _tao_any >>= const_cast<
+ const CORBA::ServiceDetailSeq *&> (
_tao_elem
);
}
@@ -806,7 +808,7 @@ CORBA::Boolean operator>>= (
);
}
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from
// be\be_visitor_structure/any_op_cs.cpp:54
// Copying insertion.
@@ -843,8 +845,8 @@ CORBA::Boolean operator>>= (
CORBA::ServiceInformation *&_tao_elem
)
{
- return _tao_any >>= ACE_const_cast (
- const CORBA::ServiceInformation *&,
+ return _tao_any >>= const_cast<
+ const CORBA::ServiceInformation *&> (
_tao_elem
);
}
@@ -864,8 +866,6 @@ CORBA::Boolean operator>>= (
);
}
-
-
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class
@@ -910,5 +910,4 @@ CORBA::Boolean operator>>= (
CORBA::ServiceInformation \
>
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 0df850c41cf..1b73e8ef277 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -26,23 +26,23 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
// TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
#include "ServicesC.h"
#include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/ORB_Core.h"
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
#endif /* __BORLANDC__ */
#if !defined (__ACE_INLINE__)
-#include "ServicesC.i"
+#include "ServicesC.inl"
#endif /* !defined INLINE */
// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
// Arg traits specializations.
namespace TAO
@@ -59,7 +59,7 @@ CORBA::ServiceDetail::_tao_any_destructor (
)
{
ServiceDetail *_tao_tmp_pointer =
- ACE_static_cast (ServiceDetail *, _tao_void_pointer);
+ static_cast<ServiceDetail *> (_tao_void_pointer);
delete _tao_tmp_pointer;
}
@@ -110,7 +110,7 @@ void CORBA::ServiceOptionSeq::_tao_any_destructor (
)
{
ServiceOptionSeq * _tao_tmp_pointer =
- ACE_static_cast (ServiceOptionSeq *, _tao_void_pointer);
+ static_cast<ServiceOptionSeq *> (_tao_void_pointer);
delete _tao_tmp_pointer;
}
@@ -163,7 +163,7 @@ void CORBA::ServiceDetailSeq::_tao_any_destructor (
)
{
ServiceDetailSeq * _tao_tmp_pointer =
- ACE_static_cast (ServiceDetailSeq *, _tao_void_pointer);
+ static_cast<ServiceDetailSeq *> (_tao_void_pointer);
delete _tao_tmp_pointer;
}
@@ -178,7 +178,7 @@ CORBA::ServiceInformation::_tao_any_destructor (
)
{
ServiceInformation *_tao_tmp_pointer =
- ACE_static_cast (ServiceInformation *, _tao_void_pointer);
+ static_cast<ServiceInformation *> (_tao_void_pointer);
delete _tao_tmp_pointer;
}
@@ -216,7 +216,7 @@ CORBA::Boolean operator<< (
const CORBA::ServiceOptionSeq &_tao_sequence
)
{
- CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+ const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
if (strm << _tao_seq_len)
{
@@ -274,7 +274,7 @@ CORBA::Boolean operator<< (
const CORBA::ServiceDetailSeq &_tao_sequence
)
{
- CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+ const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
if (strm << _tao_seq_len)
{
@@ -359,7 +359,7 @@ CORBA::Boolean operator>> (
}
// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -526,4 +526,3 @@ CORBA::Boolean operator>> (
>
#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
index 4a5d08499e3..ffa6f7f68e1 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -26,27 +26,29 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
// TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
#ifndef _TAO_IDL_ORIG_SERVICESC_H_
#define _TAO_IDL_ORIG_SERVICESC_H_
#include /**/ "ace/pre.h"
-#include "tao/VarOut_T.h"
+
+#include "ace/config-all.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
#include "tao/Environment.h"
#include "tao/Sequence_T.h"
#include "tao/Seq_Var_T.h"
#include "tao/Seq_Out_T.h"
#include "tao/VarOut_T.h"
-#include "OctetSeqC.h"
+#include "tao/OctetSeqC.h"
#if defined (TAO_EXPORT_MACRO)
#undef TAO_EXPORT_MACRO
@@ -61,9 +63,7 @@
#endif /* TAO_EXPORT_NESTED_CLASSES */
#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
#pragma warning(disable:4250)
#endif /* _MSC_VER */
@@ -383,13 +383,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInfor
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
// TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
#if defined (__ACE_INLINE__)
-#include "ServicesC.i"
+#include "ServicesC.inl"
#endif /* defined INLINE */
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */
@@ -401,3 +401,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation
#endif /* ifndef */
+
diff --git a/TAO/tao/ServicesS.i b/TAO/tao/ServicesC.inl
index 1d2df31bd57..c944d806c1f 100644
--- a/TAO/tao/ServicesS.i
+++ b/TAO/tao/ServicesC.inl
@@ -24,3 +24,4 @@
//
// Information about TAO is available at:
// http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/ServicesS.cpp b/TAO/tao/ServicesS.cpp
index 3dc704cad8c..9cc9119f046 100644
--- a/TAO/tao/ServicesS.cpp
+++ b/TAO/tao/ServicesS.cpp
@@ -26,46 +26,25 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:631
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:609
#ifndef _TAO_IDL_ORIG_SERVICESS_CPP_
#define _TAO_IDL_ORIG_SERVICESS_CPP_
#include "ServicesS.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/Operation_Table.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Typecode.h"
-#include "tao/DynamicC.h"
-#include "tao/PortableInterceptor.h"
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/PortableServer/PICurrent_Guard.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
-#include "tao/PortableServer/ServerInterceptorAdapter.h"
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
#if defined (__BORLANDC__)
#pragma option -w-rvl -w-rch -w-ccc -w-aus
#endif /* __BORLANDC__ */
#if !defined (__ACE_INLINE__)
-#include "ServicesS.i"
+#include "ServicesS.inl"
#endif /* !defined INLINE */
// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:65
// Arg traits specializations.
namespace TAO
@@ -74,13 +53,13 @@ namespace TAO
// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1680
+// be\be_visitor_root/root.cpp:1683
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
#endif /* ifndef */
diff --git a/TAO/tao/ServicesS.h b/TAO/tao/ServicesS.h
index 920ebac9c08..c8e97778a05 100644
--- a/TAO/tao/ServicesS.h
+++ b/TAO/tao/ServicesS.h
@@ -26,28 +26,23 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
// TAO_IDL - Generated from
-// be\be_codegen.cpp:411
+// be\be_codegen.cpp:390
#ifndef _TAO_IDL_ORIG_SERVICESS_H_
#define _TAO_IDL_ORIG_SERVICESS_H_
#include /**/ "ace/pre.h"
-#include "OctetSeqS.h"
+#include "tao/OctetSeqS.h"
#include "ServicesC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/Collocation_Proxy_Broker.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
#pragma warning(disable:4250)
#endif /* _MSC_VER */
@@ -68,15 +63,15 @@ namespace POA_CORBA
} // module CORBA
// TAO_IDL - Generated from
-// be\be_codegen.cpp:1014
+// be\be_codegen.cpp:997
#include "ServicesS_T.h"
#if defined (__ACE_INLINE__)
-#include "ServicesS.i"
+#include "ServicesS.inl"
#endif /* defined INLINE */
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */
@@ -86,3 +81,4 @@ namespace POA_CORBA
#include /**/ "ace/post.h"
#endif /* ifndef */
+
diff --git a/TAO/tao/ServicesS_T.i b/TAO/tao/ServicesS.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/ServicesS_T.i
+++ b/TAO/tao/ServicesS.inl
@@ -25,4 +25,3 @@
// Information about TAO is available at:
// http://www.cs.wustl.edu/~schmidt/TAO.html
-
diff --git a/TAO/tao/ServicesS_T.cpp b/TAO/tao/ServicesS_T.cpp
index 42772a3eb2c..5441c2123e1 100644
--- a/TAO/tao/ServicesS_T.cpp
+++ b/TAO/tao/ServicesS_T.cpp
@@ -25,8 +25,8 @@
// Information about TAO is available at:
// http://www.cs.wustl.edu/~schmidt/TAO.html
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:705
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:683
#ifndef _TAO_IDL_ORIG_SERVICESS_T_CPP_
#define _TAO_IDL_ORIG_SERVICESS_T_CPP_
@@ -34,9 +34,8 @@
#include "ServicesS_T.h"
#if !defined (__ACE_INLINE__)
-#include "ServicesS_T.i"
+#include "ServicesS_T.inl"
#endif /* !defined INLINE */
#endif /* ifndef */
-
diff --git a/TAO/tao/ServicesS_T.h b/TAO/tao/ServicesS_T.h
index d24670f6a4e..e607bee4a56 100644
--- a/TAO/tao/ServicesS_T.h
+++ b/TAO/tao/ServicesS_T.h
@@ -26,7 +26,7 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
// TAO_IDL - Generated from
-// be\be_codegen.cpp:566
+// be\be_codegen.cpp:546
#ifndef _TAO_IDL_ORIG_SERVICESS_T_H_
#define _TAO_IDL_ORIG_SERVICESS_T_H_
@@ -34,9 +34,7 @@
#include /**/ "ace/pre.h"
#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
#pragma warning(disable:4250)
#endif /* _MSC_VER */
@@ -44,17 +42,15 @@
// TAO_IDL - Generated from
// be\be_visitor_root/root_sth.cpp:116
-#if defined (ACE_HAS_USING_KEYWORD)
namespace POA_CORBA
{
} // module CORBA
-#endif /* ACE_HAS_USING_KEYWORD */
// TAO_IDL - Generated from
-// be\be_codegen.cpp:1111
+// be\be_codegen.cpp:1094
#if defined (__ACE_INLINE__)
-#include "ServicesS_T.i"
+#include "ServicesS_T.inl"
#endif /* defined INLINE */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -65,9 +61,10 @@ namespace POA_CORBA
#pragma implementation ("ServicesS_T.cpp")
#endif /* defined REQUIRED PRAGMA */
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
#pragma warning(pop)
#endif /* _MSC_VER */
#include /**/ "ace/post.h"
#endif /* ifndef */
+
diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesS_T.inl
index 38aa32569ba..38aa32569ba 100644
--- a/TAO/tao/ServicesC.i
+++ b/TAO/tao/ServicesS_T.inl
View Lorry Controller Status