summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2003-03-14 20:30:47 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2003-03-14 20:30:47 +0000
commit4ca67adadec2ac177000de98fed0cd15694edc9c (patch)
tree2876cfa161426dd77da6091e3c67ae665a6ffcc5 /TAO/orbsvcs/tests
parent1883bfa6ff7587917cc22fcac4494c458aecb93f (diff)
downloadATCD-4ca67adadec2ac177000de98fed0cd15694edc9c.tar.gz
ObjectIDList -> ObjectIdListC
Diffstat (limited to 'TAO/orbsvcs/tests')
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile16
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile16
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/Makefile14
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/Makefile8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile12
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile8
-rw-r--r--TAO/orbsvcs/tests/Concurrency/Makefile32
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Makefile24
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Makefile8
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile10
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Makefile8
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/Makefile2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Makefile2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/Makefile4
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Makefile64
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Makefile20
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Makefile20
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile22
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile4
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Makefile56
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/Makefile4
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile8
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile4
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile4
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile4
-rw-r--r--TAO/orbsvcs/tests/Interoperable_Naming/Makefile16
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile26
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile8
-rw-r--r--TAO/orbsvcs/tests/Miop/McastHello/Makefile20
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Makefile40
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Makefile24
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Makefile36
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile20
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Makefile36
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile24
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile24
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile20
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile24
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Makefile28
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile36
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile8
-rw-r--r--TAO/orbsvcs/tests/Property/Makefile4
-rw-r--r--TAO/orbsvcs/tests/Sched/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Makefile2
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/Makefile20
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/Makefile32
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/Makefile20
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile28
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile30
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile20
-rw-r--r--TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile20
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/Makefile6
-rw-r--r--TAO/orbsvcs/tests/Time/Makefile4
-rw-r--r--TAO/orbsvcs/tests/Trading/Makefile40
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/Makefile24
-rw-r--r--TAO/orbsvcs/tests/tests_svc_loader/Makefile4
61 files changed, 531 insertions, 531 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
index bb54485aaa2..42856de83e9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
@@ -239,8 +239,8 @@ receiver:$(addprefix $(VDIR),$(RECEIVER_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -617,8 +617,8 @@ receiver:$(addprefix $(VDIR),$(RECEIVER_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -999,8 +999,8 @@ receiver:$(addprefix $(VDIR),$(RECEIVER_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1379,8 +1379,8 @@ receiver:$(addprefix $(VDIR),$(RECEIVER_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
index 63c07f31a49..91c6b04b361 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
@@ -225,8 +225,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -607,8 +607,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile
index 7a80d83c426..5efce92e1af 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile
@@ -240,8 +240,8 @@ receiver:$(addprefix $(VDIR),$(RECEIVER_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -618,8 +618,8 @@ receiver:$(addprefix $(VDIR),$(RECEIVER_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1035,8 +1035,8 @@ receiver:$(addprefix $(VDIR),$(RECEIVER_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1450,8 +1450,8 @@ receiver:$(addprefix $(VDIR),$(RECEIVER_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
index 40df5fa0a28..4b47a28fe89 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
@@ -358,8 +358,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -613,8 +613,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
index 7fc87980491..db54368ccc1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
@@ -41,7 +41,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
include $(TAO_ROOT)/taoconfig.mk
ifeq ($(rapi),1)
- LDLIBS += -lACE_QoS
+ LDLIBS += -lACE_QoS
endif # rapi
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV
@@ -348,8 +348,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -758,8 +758,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1168,8 +1168,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
index f0f437a58fc..cb19ed27485 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile
@@ -1,5 +1,5 @@
#----------------------------------------------------------------------------
-# Makefile,v 1.3 2001/07/26 03:45:25 crodrigu Exp
+# $Id$
#
# Top-level Makefile for Pluggable testing of AVStreams of TAO.
#
@@ -209,8 +209,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -563,8 +563,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
index 94048884d2e..49a1b33a54e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
@@ -335,8 +335,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -750,8 +750,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
index 926b166b062..df924931463 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
@@ -237,8 +237,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -617,8 +617,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
index 0dbb072d96b..ef005746bb4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
@@ -238,8 +238,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -610,8 +610,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
index fa0b32c03d7..efbde6a7f57 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile
@@ -232,8 +232,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -614,8 +614,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -994,8 +994,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
index ce46b6d2775..ebda00eb152 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile
@@ -225,8 +225,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -607,8 +607,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs/AV \
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile
index 07d2a0e9e5c..00a483e2ede 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -275,8 +275,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -515,8 +515,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -752,8 +752,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -989,8 +989,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1173,8 +1173,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1357,8 +1357,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1542,8 +1542,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1781,8 +1781,8 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
index b207063dff0..41a0d580bf7 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
@@ -232,8 +232,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -578,8 +578,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -814,8 +814,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1097,8 +1097,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1380,8 +1380,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1664,8 +1664,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile b/TAO/orbsvcs/tests/CosEvent/lib/Makefile
index 97b83d1f318..41bf134299e 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile
@@ -223,8 +223,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -478,8 +478,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index b227b47dde3..9c6d6c44ce6 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -276,7 +276,7 @@ realclean:
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -668,7 +668,7 @@ realclean:
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -967,7 +967,7 @@ realclean:
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1301,7 +1301,7 @@ realclean:
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1653,7 +1653,7 @@ realclean:
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile
index 540f166bbc8..c9819c277e8 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile
@@ -282,7 +282,7 @@ endif
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -671,7 +671,7 @@ endif
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -961,7 +961,7 @@ endif
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1252,7 +1252,7 @@ endif
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index f658ff8004c..8ed9b9c8c6e 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -246,7 +246,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index b3ade408e94..2901439b81f 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -255,7 +255,7 @@ endif # LYNXTARGET == ppc
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index 2387b3cc0f0..e551c9a7e3f 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -329,7 +329,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -606,7 +606,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index 4b501c84372..2d52ef87d2f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -273,8 +273,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -583,8 +583,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -884,8 +884,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1218,8 +1218,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1603,8 +1603,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1932,8 +1932,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2261,8 +2261,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2592,8 +2592,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2946,8 +2946,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -3250,8 +3250,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -3578,8 +3578,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -3907,8 +3907,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -4236,8 +4236,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -4569,8 +4569,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -4898,8 +4898,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -5224,8 +5224,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index b99a4039f7a..d2412928a14 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -252,8 +252,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -560,8 +560,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -869,8 +869,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1183,8 +1183,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1535,8 +1535,8 @@ endif
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
index 3d030e821e5..51e06ad611c 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile
@@ -245,8 +245,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -578,8 +578,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -882,8 +882,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1187,8 +1187,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1432,8 +1432,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
index 1fa5860d2c9..6d49589b367 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
@@ -47,7 +47,7 @@ include $(TAO_ROOT)/taoconfig.mk
.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
-TAO_FT_LIBS = -lTAO_FTORB -lTAO_IORManip
+TAO_FT_LIBS = -lTAO_FTORB -lTAO_IORManip
server: $(addprefix $(VDIR),$(SERVER_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_FT_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
@@ -229,8 +229,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -436,8 +436,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -683,8 +683,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -985,8 +985,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1324,8 +1324,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
index 37c4109f90a..46fd1f46d81 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
@@ -230,8 +230,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile
index 61865fa8ce5..44a857c8a5d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile
@@ -277,8 +277,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -616,8 +616,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -918,8 +918,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1256,8 +1256,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1558,8 +1558,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1739,8 +1739,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1938,8 +1938,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2132,8 +2132,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2348,8 +2348,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2547,8 +2547,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2729,8 +2729,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2928,8 +2928,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -3122,8 +3122,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -3338,8 +3338,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
index d53a283550f..b347f441caa 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/Makefile
@@ -224,8 +224,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
index c17c5b3e313..e10f1669af3 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
@@ -268,7 +268,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -602,7 +602,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -951,7 +951,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1190,7 +1190,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile
index 6dd7d61c8ac..e6d34f4fbe4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile
@@ -254,7 +254,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -473,7 +473,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile
index 42433b57a5f..8fc035411ac 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile
@@ -254,7 +254,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -473,7 +473,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile
index c904a4a6d93..b9a3cc2303a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile
@@ -254,7 +254,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -473,7 +473,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile
index 69ac42cd0dd..9d055f4561d 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/Makefile
@@ -233,8 +233,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -535,8 +535,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -874,8 +874,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1058,8 +1058,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile
index ba987643a0a..b4c3e87429c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
endif # ! TAO_ROOT
-TAO_LB_LIBS = -lTAO_CosLoadBalancing -lTAO_PortableGroup -lTAO_CosNaming -lTAO_Messaging
+TAO_LB_LIBS = -lTAO_CosLoadBalancing -lTAO_PortableGroup -lTAO_CosNaming -lTAO_Messaging
IDL_FILES = Test
IDL_SRC = TestC.cpp TestS.cpp
@@ -242,8 +242,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -432,8 +432,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -734,8 +734,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1074,8 +1074,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1313,8 +1313,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1551,8 +1551,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile
index bf3c0de2385..aed593a53d0 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Makefile
@@ -237,8 +237,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -455,8 +455,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile b/TAO/orbsvcs/tests/Miop/McastHello/Makefile
index 00efde5f61f..0ed66717d12 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile
+++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile
@@ -226,8 +226,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -416,8 +416,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -624,8 +624,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -821,8 +821,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1123,8 +1123,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile b/TAO/orbsvcs/tests/Notify/Basic/Makefile
index a0c69fecba9..e0097a918c8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile
@@ -258,8 +258,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -514,8 +514,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -724,8 +724,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -936,8 +936,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1231,8 +1231,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1492,8 +1492,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1749,8 +1749,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2006,8 +2006,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2265,8 +2265,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2540,8 +2540,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Makefile b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
index ad395648552..0e24f0dee51 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile
@@ -333,8 +333,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -572,8 +572,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -873,8 +873,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1215,8 +1215,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1465,8 +1465,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1734,8 +1734,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Makefile b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
index ed416d6dc29..e320b01701d 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile
@@ -346,8 +346,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -585,8 +585,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -886,8 +886,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1228,8 +1228,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1478,8 +1478,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1729,8 +1729,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2073,8 +2073,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -2321,8 +2321,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2570,8 +2570,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
index 0e47b86e0e9..ed035c7829f 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile
@@ -333,8 +333,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -564,8 +564,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -865,8 +865,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1213,8 +1213,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1464,8 +1464,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
index 12a726e6d94..382dbd5831f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile
@@ -346,8 +346,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -585,8 +585,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -886,8 +886,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1228,8 +1228,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1478,8 +1478,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1729,8 +1729,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2091,8 +2091,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -2339,8 +2339,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2588,8 +2588,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
index d1e65eaa29c..985e96b0e25 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
@@ -227,8 +227,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -528,8 +528,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -870,8 +870,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1215,8 +1215,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -1463,8 +1463,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1712,8 +1712,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
index ad7296d57d0..7d717fd995b 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
@@ -231,8 +231,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -471,8 +471,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -772,8 +772,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1215,8 +1215,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -1455,8 +1455,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1704,8 +1704,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
index e872028bf53..3bf17380048 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile
@@ -224,8 +224,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -526,8 +526,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -868,8 +868,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1122,8 +1122,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1373,8 +1373,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
index d6db8be240c..45a265f1fca 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
@@ -224,8 +224,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -526,8 +526,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -876,8 +876,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1130,8 +1130,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1381,8 +1381,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1624,8 +1624,8 @@ realclean:
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile b/TAO/orbsvcs/tests/Notify/lib/Makefile
index 2cdf1e4d0fe..31b58499402 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile
@@ -232,8 +232,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -474,8 +474,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -716,8 +716,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -958,8 +958,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1200,8 +1200,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1442,8 +1442,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1684,8 +1684,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
index 3ed60c93ab6..2b49a315f75 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile
@@ -346,8 +346,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -581,8 +581,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -821,8 +821,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1122,8 +1122,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1470,8 +1470,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1722,8 +1722,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2065,8 +2065,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
$(TAO_ROOT)/tao/PortableServer/PortableServer.h \
@@ -2306,8 +2306,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2556,8 +2556,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
index da4ec147e52..0e4486ee86c 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
@@ -233,8 +233,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -553,8 +553,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index e61bcbcb0eb..1fe14671484 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -265,7 +265,7 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -580,7 +580,7 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index f197227fcff..cd5ffa83ad6 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ b/TAO/orbsvcs/tests/Sched/Makefile
@@ -249,7 +249,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index 562c9e5bc47..c30836083a7 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -254,7 +254,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Makefile b/TAO/orbsvcs/tests/Security/Big_Request/Makefile
index 2203cba1b1d..ef33501cf2a 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile
@@ -233,8 +233,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -424,8 +424,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -632,8 +632,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -830,8 +830,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1169,8 +1169,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile b/TAO/orbsvcs/tests/Security/Callback/Makefile
index 6ff1e52a9f4..c35c4163e0b 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Makefile
+++ b/TAO/orbsvcs/tests/Security/Callback/Makefile
@@ -244,8 +244,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -442,8 +442,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -640,8 +640,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -838,8 +838,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1037,8 +1037,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1376,8 +1376,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1715,8 +1715,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2016,8 +2016,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile
index 1312a91044e..c211bb228fd 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile
@@ -254,8 +254,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -442,8 +442,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -640,8 +640,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -838,8 +838,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1176,8 +1176,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
index fbca43b91bd..913bd761b5f 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
@@ -281,8 +281,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -469,8 +469,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -708,8 +708,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1118,8 +1118,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1348,8 +1348,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1528,8 +1528,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1830,8 +1830,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile
index 4640921d1e6..16100c1eda0 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile
@@ -14,7 +14,7 @@ endif # ! TAO_ROOT
IDL_FILES = test
IDL_SRC = testC.cpp testS.cpp
-BIN_UNCHECKED = client server
+BIN_UNCHECKED = client server
SRC = $(addsuffix .cpp, $(BIN) test_i Client_Worker Server_Worker) $(IDL_SRC)
@@ -274,8 +274,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -462,8 +462,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -701,8 +701,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -948,8 +948,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1178,8 +1178,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1358,8 +1358,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1660,8 +1660,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile
index 102fbb200f1..150e578f6e2 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile
@@ -259,8 +259,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -465,8 +465,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -685,8 +685,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -904,8 +904,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1242,8 +1242,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile b/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
index c118c72d5e7..5621b881061 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/Makefile
@@ -259,8 +259,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -447,8 +447,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -665,8 +665,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -883,8 +883,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1222,8 +1222,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index 444bd5b50ac..a77e0abb3dd 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -266,7 +266,7 @@ realclean:
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -600,7 +600,7 @@ realclean:
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -949,7 +949,7 @@ realclean:
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile
index d0bae7a08fc..d9c55009925 100644
--- a/TAO/orbsvcs/tests/Time/Makefile
+++ b/TAO/orbsvcs/tests/Time/Makefile
@@ -267,7 +267,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -541,7 +541,7 @@ realclean: clean
$(TAO_ROOT)/tao/DomainC.i \
$(TAO_ROOT)/tao/WrongTransactionC.h \
$(TAO_ROOT)/tao/WrongTransactionC.i \
- $(TAO_ROOT)/tao/ObjectIDListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListCC.h \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 5d3fb57f6a0..233df7ff4ee 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -259,8 +259,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -519,8 +519,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -727,8 +727,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -990,8 +990,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1315,8 +1315,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1543,8 +1543,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1881,8 +1881,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2188,8 +2188,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2491,8 +2491,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -2800,8 +2800,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile
index 462d16de692..fd76e639ed1 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile
@@ -223,8 +223,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -424,8 +424,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -608,8 +608,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -910,8 +910,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1249,8 +1249,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -1448,8 +1448,8 @@ realclean: clean
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile b/TAO/orbsvcs/tests/tests_svc_loader/Makefile
index b5cc5db24a3..8d8910ab9b9 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile
+++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile
@@ -220,8 +220,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
$(TAO_ROOT)/tao/WrongTransactionC.i \
$(TAO_ROOT)/tao/Object_KeyC.h \
$(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/ObjectIdListC.h \
+ $(TAO_ROOT)/tao/ObjectIdListC.i \
$(TAO_ROOT)/tao/StringSeqC.h \
$(TAO_ROOT)/tao/StringSeqC.i \
$(TAO_ROOT)/tao/PortableInterceptorC.h \