diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-14 20:30:47 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-14 20:30:47 +0000 |
| commit | f66e5760483d3fdd798c85ec3fc655972f726bd7 (patch) | |
| tree | 2876cfa161426dd77da6091e3c67ae665a6ffcc5 | |
| parent | 012bbb348038d9b5ad2740db328225c91ad5e653 (diff) | |
| download | ATCD-f66e5760483d3fdd798c85ec3fc655972f726bd7.tar.gz | |
ObjectIDList -> ObjectIdListC
108 files changed, 1933 insertions, 888 deletions
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile index 21ee4ea503c..77b29d6640b 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile @@ -222,8 +222,8 @@ server: $(addprefix $(VDIR),$(SERVER_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 \ @@ -403,8 +403,8 @@ server: $(addprefix $(VDIR),$(SERVER_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 \ @@ -600,8 +600,8 @@ server: $(addprefix $(VDIR),$(SERVER_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 \ @@ -798,8 +798,8 @@ server: $(addprefix $(VDIR),$(SERVER_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/docs/tutorials/Quoter/On_Demand_Activation/Makefile b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile index 3776192b723..6f7aa8682ad 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile @@ -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 \ @@ -428,8 +428,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/docs/tutorials/Quoter/Simple/Client/Makefile b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile index f48a92c906d..1dcd02574cc 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile @@ -212,8 +212,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/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile index dbf1ebe143e..ca5b184c803 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile @@ -223,8 +223,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 \ @@ -605,8 +605,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 \ @@ -803,8 +803,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/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile index 1039094c970..a0962f9a1a3 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile @@ -211,8 +211,8 @@ server: $(addprefix $(VDIR),$(SERVER_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 \ @@ -408,8 +408,8 @@ server: $(addprefix $(VDIR),$(SERVER_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 \ @@ -606,8 +606,8 @@ server: $(addprefix $(VDIR),$(SERVER_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/docs/tutorials/Quoter/Simple/Persistent/Makefile b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile index 4e40f23d5e0..9f97b3c2221 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile @@ -223,8 +223,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 \ @@ -420,8 +420,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 \ @@ -601,8 +601,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 \ @@ -799,8 +799,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/docs/tutorials/Quoter/Simple/Server/Makefile b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile index f7fde53a899..6c806c75f1f 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile +++ b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile @@ -211,8 +211,8 @@ server: $(addprefix $(VDIR),$(SERVER_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 \ @@ -408,8 +408,8 @@ server: $(addprefix $(VDIR),$(SERVER_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 \ @@ -606,8 +606,8 @@ server: $(addprefix $(VDIR),$(SERVER_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/docs/tutorials/Quoter/idl/Makefile b/TAO/docs/tutorials/Quoter/idl/Makefile index 5c06b1992d6..e19eabcb002 100644 --- a/TAO/docs/tutorials/Quoter/idl/Makefile +++ b/TAO/docs/tutorials/Quoter/idl/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 \ @@ -517,8 +517,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/IFR_Service/Makefile.IFR_Service b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service index 87504c72c14..bc776175d07 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service +++ b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service @@ -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 \ @@ -428,8 +428,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/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile index 4f2df2b78a8..943c3cad2c8 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile +++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile @@ -255,8 +255,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 \ @@ -566,8 +566,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 \ @@ -923,8 +923,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 \ @@ -1149,8 +1149,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 \ @@ -1343,8 +1343,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 \ @@ -1605,8 +1605,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/examples/CosEC/RtEC_Based/bin/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile index a0604f4bd99..716aa6437da 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile @@ -214,8 +214,8 @@ CPPFLAGS += -I../lib -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(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/examples/CosEC/RtEC_Based/lib/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile index 50d19d67633..db93626e9e7 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile @@ -238,8 +238,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 \ @@ -749,8 +749,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 \ @@ -1022,8 +1022,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 \ @@ -1297,8 +1297,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 \ @@ -1557,8 +1557,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/examples/CosEC/RtEC_Based/tests/Basic/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile index acc1276b0f3..608c1afccb7 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile @@ -215,8 +215,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(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 \ @@ -491,8 +491,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(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 \ @@ -703,8 +703,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(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/examples/CosEC/RtEC_Based/tests/Multiple/Makefile b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile index 59c69818bd6..d7a10772f7b 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile @@ -239,8 +239,8 @@ Consumer: $(addprefix $(VDIR),$(SIMPLE_CON_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 \ @@ -477,8 +477,8 @@ Consumer: $(addprefix $(VDIR),$(SIMPLE_CON_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 \ @@ -736,8 +736,8 @@ Consumer: $(addprefix $(VDIR),$(SIMPLE_CON_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/examples/CosEC/Simple/Makefile b/TAO/orbsvcs/examples/CosEC/Simple/Makefile index ee534269679..ba691148fa8 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Makefile +++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile @@ -228,8 +228,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 \ @@ -477,8 +477,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 \ @@ -689,8 +689,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/examples/Log/Basic/Makefile b/TAO/orbsvcs/examples/Log/Basic/Makefile index d095aa6c9bc..21e60bb594e 100644 --- a/TAO/orbsvcs/examples/Log/Basic/Makefile +++ b/TAO/orbsvcs/examples/Log/Basic/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 \ @@ -442,8 +442,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/examples/Log/Event/Makefile b/TAO/orbsvcs/examples/Log/Event/Makefile index e15d83adba0..1e73090c487 100644 --- a/TAO/orbsvcs/examples/Log/Event/Makefile +++ b/TAO/orbsvcs/examples/Log/Event/Makefile @@ -231,8 +231,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 \ @@ -470,8 +470,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/examples/Log/Notify/Makefile b/TAO/orbsvcs/examples/Log/Notify/Makefile index a45adca95fa..8ece572f397 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Makefile +++ b/TAO/orbsvcs/examples/Log/Notify/Makefile @@ -236,8 +236,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 \ @@ -530,8 +530,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/examples/Log/RTEvent/Makefile b/TAO/orbsvcs/examples/Log/RTEvent/Makefile index fa3aee00183..e395f2512df 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile +++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile @@ -253,8 +253,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 \ @@ -509,8 +509,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/examples/Notify/Filter/Makefile b/TAO/orbsvcs/examples/Notify/Filter/Makefile index 1f889ed7a5b..6bf04c435d8 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Makefile +++ b/TAO/orbsvcs/examples/Notify/Filter/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 \ @@ -477,8 +477,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/examples/Notify/Subscribe/Makefile b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile index 7e955216ad3..fec186397c2 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile +++ b/TAO/orbsvcs/examples/Notify/Subscribe/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 \ @@ -477,8 +477,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/examples/ORT/Makefile b/TAO/orbsvcs/examples/ORT/Makefile index 84b829247df..4c4ed64c5ac 100644 --- a/TAO/orbsvcs/examples/ORT/Makefile +++ b/TAO/orbsvcs/examples/ORT/Makefile @@ -13,7 +13,7 @@ endif # ! TAO_ROOT IDL_FILES = Gateway sum_server TAO_IDLFLAGS += -I../../.. IDL_SRC = GatewayC.cpp GatewayS.cpp sum_serverC.cpp sum_serverS.cpp -BIN_UNCHECKED = client gateway_server server +BIN_UNCHECKED = client gateway_server server SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) Gateway_i Object_Factory_i sum_server_i Server_IORInterceptor_ORBInitializer Server_IORInterceptor) $(IDL_SRC) @@ -246,8 +246,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 \ @@ -437,8 +437,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 \ @@ -671,8 +671,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 \ @@ -1135,8 +1135,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 \ @@ -1407,8 +1407,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 \ @@ -1642,8 +1642,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 GatewayC.i \ + $(TAO_ROOT)/tao/ObjectIdListC.h \ + $(TAO_ROOT)/tao/ObjectIdListC.i GatewayC.i \ $(TAO_ROOT)/tao/ORBInitInfo.h \ $(TAO_ROOT)/tao/ORBInitInfo.inl \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1901,8 +1901,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 \ @@ -2101,8 +2101,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 \ @@ -2403,8 +2403,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 \ @@ -2742,8 +2742,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 \ @@ -3044,8 +3044,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/examples/PSS/Makefile b/TAO/orbsvcs/examples/PSS/Makefile index c56a0b36795..f30a5c8e9d7 100644 --- a/TAO/orbsvcs/examples/PSS/Makefile +++ b/TAO/orbsvcs/examples/PSS/Makefile @@ -20,7 +20,7 @@ IDL_FILES = Simple_Naming Server PSDL_SRC = naming_dataC.cpp IDL_SRC = Simple_NamingC.cpp Simple_NamingS.cpp ServerC.cpp ServerS.cpp -SIMPLE_NAMING_SRC = Simple_Naming.cpp Simple_Naming_i.cpp +SIMPLE_NAMING_SRC = Simple_Naming.cpp Simple_Naming_i.cpp SERVER_SRC = Server_i.cpp ServerC.cpp ServerS.cpp server.cpp CLIENT_SRC = client.cpp @@ -262,8 +262,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 \ @@ -557,8 +557,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 \ @@ -894,8 +894,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 \ @@ -1189,8 +1189,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 \ @@ -1523,8 +1523,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 \ @@ -1720,8 +1720,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 \ @@ -2015,8 +2015,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 \ @@ -2350,8 +2350,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 \ @@ -2559,8 +2559,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/examples/RtEC/MCast/Makefile b/TAO/orbsvcs/examples/RtEC/MCast/Makefile index 314e94929e2..6dcad8f8b94 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile +++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile @@ -246,8 +246,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 \ @@ -625,8 +625,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 \ @@ -882,8 +882,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 \ @@ -1140,8 +1140,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/examples/RtEC/Schedule/Makefile b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile index acdcd11b8be..ea1ae128c3a 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile @@ -261,8 +261,8 @@ Service: $(addprefix $(VDIR),$(Service_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 \ @@ -652,8 +652,8 @@ Service: $(addprefix $(VDIR),$(Service_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 \ @@ -892,8 +892,8 @@ Service: $(addprefix $(VDIR),$(Service_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/examples/RtEC/Simple/Makefile b/TAO/orbsvcs/examples/RtEC/Simple/Makefile index 6588ab8ed7d..9f2ac22b0e8 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile +++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile @@ -228,8 +228,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 \ @@ -540,8 +540,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 \ @@ -787,8 +787,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/examples/Security/SecurityLevel1/Makefile b/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile index 87a9de5a25f..eaee95f62cf 100644 --- a/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile +++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/Makefile @@ -48,7 +48,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk -# Depending on what the new library is called: that +# Depending on what the new library is called: that # should also be linked ifeq ($(static_libs_only),1) @@ -246,8 +246,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(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 \ @@ -444,8 +444,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(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 \ @@ -659,8 +659,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(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 \ @@ -873,8 +873,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(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 \ @@ -1221,8 +1221,8 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(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/examples/Security/Send_File/Makefile b/TAO/orbsvcs/examples/Security/Send_File/Makefile index 1312a91044e..c211bb228fd 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/Makefile +++ b/TAO/orbsvcs/examples/Security/Send_File/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/performance-tests/RTEvent/Colocated_Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile index f94579b730a..1bf26898938 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile @@ -290,8 +290,8 @@ driver: $(addprefix $(VDIR),$(driver_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/performance-tests/RTEvent/Federated_Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile index 7fe6a33b94f..7e7b7ba4bcc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile @@ -282,8 +282,8 @@ server: $(addprefix $(VDIR),$(server_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 \ @@ -608,8 +608,8 @@ server: $(addprefix $(VDIR),$(server_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/performance-tests/RTEvent/RTCORBA_Baseline/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile index 79b3fbaed90..782239d7c3c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile @@ -292,8 +292,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 \ @@ -603,8 +603,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 \ @@ -891,8 +891,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 \ @@ -1089,8 +1089,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 \ @@ -1375,8 +1375,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/performance-tests/RTEvent/RTCORBA_Callback/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile index 1d1b628a8ca..b666216c7ed 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile @@ -235,8 +235,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 \ @@ -582,8 +582,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 \ @@ -939,8 +939,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 \ @@ -1136,8 +1136,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 \ @@ -1336,8 +1336,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 \ @@ -1536,8 +1536,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 \ @@ -1822,8 +1822,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/performance-tests/RTEvent/Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile index 63a4353fa38..14c05f054e2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile @@ -324,8 +324,8 @@ server: $(addprefix $(VDIR),$(server_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 \ @@ -683,8 +683,8 @@ server: $(addprefix $(VDIR),$(server_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/performance-tests/RTEvent/lib/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile index b4d054a141d..9100bc8a7fb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile @@ -297,8 +297,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 \ @@ -544,8 +544,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 \ @@ -787,8 +787,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 \ @@ -1036,8 +1036,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 \ @@ -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 \ @@ -1924,8 +1924,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 \ @@ -2207,8 +2207,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 \ @@ -2814,8 +2814,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 \ @@ -3063,8 +3063,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 \ @@ -3666,8 +3666,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 \ @@ -4490,8 +4490,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 \ @@ -4697,8 +4697,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 \ @@ -4984,8 +4984,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 \ @@ -5313,8 +5313,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 \ @@ -5711,8 +5711,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 \ @@ -6031,8 +6031,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/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 \ diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile index 4d8c4ad4c97..8893b96c1f0 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile +++ b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile @@ -358,8 +358,8 @@ realclean: clean $(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 testC.i \ $(TAO_ROOT)/tests/RTCORBA/Linear_Priority/readers.cpp \ @@ -649,8 +649,8 @@ realclean: clean $(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 testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ @@ -835,8 +835,8 @@ realclean: clean $(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 \ @@ -1137,8 +1137,8 @@ realclean: clean $(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/tests/AMH_Oneway/Makefile b/TAO/tests/AMH_Oneway/Makefile index b19a843b6ca..0ab1a5a1e8e 100644 --- a/TAO/tests/AMH_Oneway/Makefile +++ b/TAO/tests/AMH_Oneway/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 \ @@ -430,8 +430,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 \ @@ -713,8 +713,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 \ @@ -1015,8 +1015,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/tests/Abstract_Interface/Makefile b/TAO/tests/Abstract_Interface/Makefile index 9e36649cad7..633c659f3ba 100644 --- a/TAO/tests/Abstract_Interface/Makefile +++ b/TAO/tests/Abstract_Interface/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 \ @@ -420,8 +420,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 \ @@ -634,8 +634,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 \ @@ -838,8 +838,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 \ @@ -1137,8 +1137,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/tests/Collocation/Makefile.impl b/TAO/tests/Collocation/Makefile.impl index 0dcaa4bef4b..130908fb985 100644 --- a/TAO/tests/Collocation/Makefile.impl +++ b/TAO/tests/Collocation/Makefile.impl @@ -74,6 +74,346 @@ endif .obj/DiamondS.o .obj/DiamondS.so .shobj/DiamondS.o .shobj/DiamondS.so: DiamondS.cpp DiamondS.h DiamondC.h \ +<<<<<<< Makefile.impl + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Time_Value.inl \ + $(ACE_ROOT)/ace/Default_Constants.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(ACE_ROOT)/ace/Exception_Macros.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Policy_ForwardC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/Policy_ForwardC.i \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/objectid.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/AbstractBase.h \ + $(TAO_ROOT)/tao/AbstractBase.inl \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.i \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.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 \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ + $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \ + $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i stub_export.h \ + DiamondC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + diamond_export.h DiamondS_T.h DiamondS_T.i DiamondS_T.cpp DiamondS.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/XML_Svc_Conf.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/DLL.h \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + $(TAO_ROOT)/tao/Policy_Validator.h \ + $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ + $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ + $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + $(TAO_ROOT)/tao/Policy_Set.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/PICurrent.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/PICurrent.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Exit.h \ + $(ACE_ROOT)/ace/Thread_Control.h \ + $(ACE_ROOT)/ace/Thread_Control.inl \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Framework_Component.h \ + $(ACE_ROOT)/ace/Framework_Component.inl \ + $(ACE_ROOT)/ace/Framework_Component_T.h \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ + $(ACE_ROOT)/ace/Framework_Component_T.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \ + $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \ + $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp +======= $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -427,8 +767,208 @@ endif $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ $(ACE_ROOT)/ace/Dynamic_Service.cpp +>>>>>>> 1.23 .obj/Diamond_i.o .obj/Diamond_i.so .shobj/Diamond_i.o .shobj/Diamond_i.so: Diamond_i.cpp Diamond_i.h DiamondS.h DiamondC.h \ +<<<<<<< Makefile.impl + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Time_Value.inl \ + $(ACE_ROOT)/ace/Default_Constants.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(ACE_ROOT)/ace/Exception_Macros.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Policy_ForwardC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/Policy_ForwardC.i \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/objectid.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/AbstractBase.h \ + $(TAO_ROOT)/tao/AbstractBase.inl \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.i \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.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 \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ + $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \ + $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i stub_export.h \ + DiamondC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + diamond_export.h DiamondS_T.h DiamondS_T.i DiamondS_T.cpp DiamondS.i +======= $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -658,5 +1198,6 @@ endif $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ diamond_export.h DiamondS_T.h DiamondS_T.i DiamondS_T.cpp DiamondS.i +>>>>>>> 1.23 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Collocation/Makefile.stub b/TAO/tests/Collocation/Makefile.stub index e4cceb6e4d8..ba17558b1e6 100644 --- a/TAO/tests/Collocation/Makefile.stub +++ b/TAO/tests/Collocation/Makefile.stub @@ -72,6 +72,308 @@ endif .obj/DiamondC.o .obj/DiamondC.so .shobj/DiamondC.o .shobj/DiamondC.so: DiamondC.cpp DiamondC.h \ +<<<<<<< Makefile.stub + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Time_Value.inl \ + $(ACE_ROOT)/ace/Default_Constants.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(ACE_ROOT)/ace/Exception_Macros.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Policy_ForwardC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/Policy_ForwardC.i \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/objectid.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/AbstractBase.h \ + $(TAO_ROOT)/tao/AbstractBase.inl \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.i \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.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 \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ + $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \ + $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i stub_export.h \ + DiamondC.i $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Set.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/DLL.h \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/XML_Svc_Conf.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ + $(TAO_ROOT)/tao/PICurrent.h \ + $(TAO_ROOT)/tao/PICurrent.inl \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Exit.h \ + $(ACE_ROOT)/ace/Thread_Control.h \ + $(ACE_ROOT)/ace/Thread_Control.inl \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Framework_Component.h \ + $(ACE_ROOT)/ace/Framework_Component.inl \ + $(ACE_ROOT)/ace/Framework_Component_T.h \ + $(ACE_ROOT)/ace/Framework_Component_T.inl \ + $(ACE_ROOT)/ace/Framework_Component_T.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \ + $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Condition.h \ + $(TAO_ROOT)/tao/Condition.inl \ + $(TAO_ROOT)/tao/Condition.cpp \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Invocation_Event.h \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ + $(TAO_ROOT)/tao/LF_Invocation_Event.inl \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + $(TAO_ROOT)/tao/ClientRequestInfo_i.h \ + $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \ + $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \ + $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl +======= $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ @@ -403,5 +705,6 @@ endif $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl +>>>>>>> 1.23 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Collocation/Makefile.test b/TAO/tests/Collocation/Makefile.test index 65968f27850..b1ef573cd4e 100644 --- a/TAO/tests/Collocation/Makefile.test +++ b/TAO/tests/Collocation/Makefile.test @@ -45,6 +45,206 @@ include $(TAO_ROOT)/taoconfig.mk .obj/Collocation_Tester.o .obj/Collocation_Tester.so .shobj/Collocation_Tester.o .shobj/Collocation_Tester.so: Collocation_Tester.cpp Collocation_Tester.h \ +<<<<<<< Makefile.test + Diamond_i.h DiamondS.h DiamondC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/Time_Value.inl \ + $(ACE_ROOT)/ace/Default_Constants.h \ + $(ACE_ROOT)/ace/Global_Macros.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(ACE_ROOT)/ace/Exception_Macros.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Policy_ForwardC.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/Policy_ForwardC.i \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ + $(TAO_ROOT)/tao/objectid.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/AbstractBase.h \ + $(TAO_ROOT)/tao/AbstractBase.inl \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.i \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.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 \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \ + $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \ + $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \ + $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i stub_export.h \ + DiamondC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.h \ + $(ACE_ROOT)/ace/Atomic_Op_T.i \ + $(ACE_ROOT)/ace/Atomic_Op_T.cpp \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + diamond_export.h DiamondS_T.h DiamondS_T.i DiamondS_T.cpp DiamondS.i +======= Diamond_i.h DiamondS.h DiamondC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ @@ -275,5 +475,6 @@ include $(TAO_ROOT)/taoconfig.mk $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ diamond_export.h DiamondS_T.h DiamondS_T.i DiamondS_T.cpp DiamondS.i +>>>>>>> 1.23 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/RTCORBA/Diffserv/Makefile b/TAO/tests/RTCORBA/Diffserv/Makefile index 5761211e9ba..81719a4dbfe 100644 --- a/TAO/tests/RTCORBA/Diffserv/Makefile +++ b/TAO/tests/RTCORBA/Diffserv/Makefile @@ -17,11 +17,11 @@ IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN_UNCHECKED = server client -SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC) +SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC) CLIENT_OBJS = client.o testC.o Custom_Network_Priority_Mapping.o -SERVER_OBJS = server.o Custom_Network_Priority_Mapping.o $(IDL_SRC:.cpp=.o) +SERVER_OBJS = server.o Custom_Network_Priority_Mapping.o $(IDL_SRC:.cpp=.o) BUILD = $(BIN) RT_TAO_SRVR_LIBS = $(LDLIBS:%=%$(VAR)) @@ -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 \ @@ -465,8 +465,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 \ @@ -754,8 +754,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 \ @@ -1046,8 +1046,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/tests/Smart_Proxies/Benchmark/Makefile b/TAO/tests/Smart_Proxies/Benchmark/Makefile index bcb60e96b92..aa45c591700 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Makefile +++ b/TAO/tests/Smart_Proxies/Benchmark/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 \ @@ -438,8 +438,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 \ @@ -657,8 +657,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 \ @@ -850,8 +850,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 \ @@ -1143,8 +1143,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/tests/Smart_Proxies/Policy/Makefile b/TAO/tests/Smart_Proxies/Policy/Makefile index 4e05eaa857a..988ac020441 100644 --- a/TAO/tests/Smart_Proxies/Policy/Makefile +++ b/TAO/tests/Smart_Proxies/Policy/Makefile @@ -234,8 +234,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 \ @@ -428,8 +428,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 \ @@ -647,8 +647,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 \ @@ -840,8 +840,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 \ @@ -1133,8 +1133,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/tests/Strategies/Makefile b/TAO/tests/Strategies/Makefile index 58f11d9d260..617f5bd1bab 100644 --- a/TAO/tests/Strategies/Makefile +++ b/TAO/tests/Strategies/Makefile @@ -263,8 +263,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 \ @@ -456,8 +456,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 \ @@ -655,8 +655,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 \ @@ -854,8 +854,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 \ @@ -1160,8 +1160,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/tests/Xt_Stopwatch/Makefile b/TAO/tests/Xt_Stopwatch/Makefile index 3a340dda413..73c1d871f4b 100644 --- a/TAO/tests/Xt_Stopwatch/Makefile +++ b/TAO/tests/Xt_Stopwatch/Makefile @@ -225,8 +225,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 \ @@ -417,8 +417,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 \ @@ -625,8 +625,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 \ @@ -823,8 +823,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 \ @@ -1005,8 +1005,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 \ @@ -1188,8 +1188,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 \ @@ -1370,8 +1370,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 \ @@ -1676,8 +1676,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/utils/catior/Makefile b/TAO/utils/catior/Makefile index 86e7d8628af..79b08897cab 100644 --- a/TAO/utils/catior/Makefile +++ b/TAO/utils/catior/Makefile @@ -219,8 +219,8 @@ include $(TAO_ROOT)/taoconfig.mk $(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/utils/nslist/Makefile b/TAO/utils/nslist/Makefile index 8859da72d0a..023eb2cab9e 100644 --- a/TAO/utils/nslist/Makefile +++ b/TAO/utils/nslist/Makefile @@ -223,8 +223,8 @@ include $(TAO_ROOT)/taoconfig.mk $(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 @@ include $(TAO_ROOT)/taoconfig.mk $(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 \ @@ -702,8 +702,8 @@ include $(TAO_ROOT)/taoconfig.mk $(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 \ |