diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-03-22 06:28:10 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-03-22 06:28:10 +0000 |
| commit | 50398722f38cf591821c4a62818896e19a1e8f92 (patch) | |
| tree | 10d97ee62a42174752038160d3c826c38682f178 | |
| parent | 3dcad1e906d4453b09891ee7bc55ae7932fe604f (diff) | |
| download | ATCD-50398722f38cf591821c4a62818896e19a1e8f92.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/Makefile | 330 | ||||
| -rw-r--r-- | TAO/tao/TAO.h | 10 | ||||
| -rw-r--r-- | TAO/tao/any.cpp | 822 | ||||
| -rw-r--r-- | TAO/tao/any.h | 343 | ||||
| -rw-r--r-- | TAO/tao/any.i | 293 | ||||
| -rw-r--r-- | TAO/tao/arg_shifter.cpp | 117 | ||||
| -rw-r--r-- | TAO/tao/arg_shifter.h | 98 | ||||
| -rw-r--r-- | TAO/tao/default_server.h | 3 | ||||
| -rw-r--r-- | TAO/tao/nvlist.cpp | 297 | ||||
| -rw-r--r-- | TAO/tao/nvlist.h | 160 | ||||
| -rw-r--r-- | TAO/tao/nvlist.i | 63 | ||||
| -rw-r--r-- | TAO/tao/objkey.idl | 3 | ||||
| -rw-r--r-- | TAO/tao/principa.cpp | 50 | ||||
| -rw-r--r-- | TAO/tao/principa.h | 67 | ||||
| -rw-r--r-- | TAO/tao/strategy_T.cpp | 56 | ||||
| -rw-r--r-- | TAO/tao/strategy_T.h | 44 | ||||
| -rw-r--r-- | TAO/tao/strategy_T.i | 21 |
17 files changed, 258 insertions, 2519 deletions
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 1a07007cd80..8d843ded348 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -247,8 +247,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -425,8 +425,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -603,8 +603,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -781,8 +781,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -959,8 +959,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -1137,8 +1137,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -1326,8 +1326,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -1507,8 +1507,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -1686,8 +1686,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -1865,8 +1865,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -2043,8 +2043,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -2221,8 +2221,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -2399,8 +2399,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -2577,8 +2577,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -2756,8 +2756,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -2934,8 +2934,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -3112,8 +3112,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -3292,8 +3292,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -3470,8 +3470,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -3648,8 +3648,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -3826,8 +3826,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -4004,8 +4004,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -4230,8 +4230,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/CORBA.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i .obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/OS.h \ @@ -4360,8 +4360,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -4538,8 +4538,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -4716,8 +4716,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -4896,8 +4896,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -5074,8 +5074,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -5252,8 +5252,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -5430,8 +5430,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -5610,8 +5610,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -5788,8 +5788,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -5966,8 +5966,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -6158,8 +6158,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -6336,8 +6336,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -6514,8 +6514,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -6744,8 +6744,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/CORBA.i \ $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/TAO_Internal.h .obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \ $(TAO_ROOT)/tao/corba.h \ @@ -6875,8 +6875,8 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/strategy_T.h \ - $(TAO_ROOT)/tao/strategy_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/Object.h \ @@ -6926,7 +6926,183 @@ LDFLAGS += $(RLDFLAGS) $(TAO_ROOT)/tao/Request.i \ $(TAO_ROOT)/tao/singletons.h .obj/TAO.o .obj/TAO.so .shobj/TAO.o .shobj/TAO.so: TAO.cpp TAO.h \ - $(TAO_ROOT)/tao/Object_KeyC.h + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Version.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(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/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(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/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/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(TAO_ROOT)/tao/compat/objbase.h \ + $(TAO_ROOT)/tao/compat/initguid.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/CORBA.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/CORBA.i \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/singletons.h .obj/Timeprobe.o .obj/Timeprobe.so .shobj/Timeprobe.o .shobj/Timeprobe.so: Timeprobe.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h index 2f8e736b4d7..1bb4ecf4e62 100644 --- a/TAO/tao/TAO.h +++ b/TAO/tao/TAO.h @@ -21,7 +21,6 @@ #define TAO_H #include "tao/corba.h" -#include "tao/Object_KeyC.h" class TAO_Export TAO_ORB_Manager { @@ -94,12 +93,11 @@ class TAO // = TITLE // Defines a namespace for externally visible TAO extensions. public: - // From objkeyC - typedef ObjectKey TAO_ObjectKey; - typedef ObjectKey_var TAO_ObjectKey_var; - typedef ObjectKey_out TAO_ObjectKey_out; + // From Object_KeyC.h + typedef TAO_ObjectKey ObjectKey; + typedef TAO_ObjectKey_var ObjectKey_var; + typedef TAO_ObjectKey_out ObjectKey_out; - // From tao_util typedef TAO_ORB_Manager ORB_Manager; ACE_CLASS_IS_NAMESPACE (TAO); diff --git a/TAO/tao/any.cpp b/TAO/tao/any.cpp deleted file mode 100644 index e2f22211c61..00000000000 --- a/TAO/tao/any.cpp +++ /dev/null @@ -1,822 +0,0 @@ -// @ (#) $Id$ - -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// ORB: Implementation of CORBA_Any -// -// This includes three constructors, a destructor, and a "replace" -// method for the "Any" data type. "Any" values pair a pointer to a -// data structure in the native binary representation (e.g. C struct) -// with a TypeCode that describes that data structure. -// -// The copy constructor and the destructor each use the TypeCode -// interpreter with specialized "visit" callback routines. The -// "visit" routines are used respectively to make "deep copies" and -// perform "deep frees" of the aritrary values as described by the -// "Any" value's typecode. -// -// Note that these "visit" routines are called directly, and they -// choose whether or not to use the TypeCode interpreter to examine -// constituents. In the simple cases, the "visit" routines can do -// their work without any further calls; only for constructed types is -// the interpreter's knowledge really required. -// -// THREADING NOTE: "Any" is a data structure which must be protected -// by external critical sections. Like simpler numeric types, "Any" -// instances are accessed and modified atomically. This -// implementation is reentrant, so that independent "Any" values may -// be manipulated concurrently when the underlying programming -// environment is itself reentrant. -// -// COM NOTE: Yes, this is a utility data type whose implementation is -// fully exposed. Factories for these are not normally used in C++. - -#include "tao/corba.h" - -CORBA::TypeCode_ptr -CORBA_Any::type (void) const -{ - return this->type_; -} - -const void * -CORBA_Any::value (void) const -{ - return this->value_; -} - -// Default "Any" constructor -- initializes to nulls per the -// OMG C++ mapping. - -// NOTE: null (zero) typecode pointers are also treated as the null -// typecode ... - -CORBA_Any::CORBA_Any (void) - : type_ (CORBA::_tc_null), - value_ (0), - orb_owns_data_ (CORBA::B_FALSE), - refcount_ (1) -{ -} - -// The more common "Any" constructor has its own copy of a typecode, -// and either holds or "consumes" an arbitrary data value satisfying -// the normal binary interface rules. - -CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc, - void *value, - CORBA::Boolean orb_owns_data) - : type_ (tc), - value_ (value), - orb_owns_data_ (orb_owns_data), - refcount_ (1) -{ - tc->AddRef (); -} - -// Helper routine for "Any" copy constructor ... -// -// "Deep Copy" from source to dest. Memory is always there to be -// copied to ... if this calls itself recursively, it ensures that -// this remains true (only really an issue for sequences) . -// -// This shows the main reason to pass two values to the "visit" -// function used by the TypeCode interpreter: it allows the copy to be -// made without using any additional temporary memory. Most other -// such "visit" routines use only a single value. This is also -// slightly atypical in that it doesn't use the "context". - -static CORBA::TypeCode::traverse_status -deep_copy (CORBA::TypeCode_ptr tc, - const void *source, - const void *dest, - void *, // no context - CORBA::Environment &env) -{ - CORBA::TypeCode::traverse_status retval; - CORBA::TCKind my_kind; - - if (!tc) - { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO) ); - return CORBA::TypeCode::TRAVERSE_STOP; - } - - my_kind = tc->kind (env); - - if (env.exception_type () != CORBA::NO_EXCEPTION) - return CORBA::TypeCode::TRAVERSE_STOP; - - // Deep copy from "source" to "dest" ... this code "knows" a bit - // about representations, verify it when porting to oddball - // platforms with non-IEEE floating point values or atypical byte - // and word sizes. - // - // See the TypeCode interpreter code for more details about the - // representational assumptions here. - - retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - - switch (my_kind) - { - case CORBA::tk_null: - case CORBA::tk_void: - break; - - case CORBA::tk_char: - case CORBA::tk_octet: - *(CORBA::Octet *) dest = *(CORBA::Octet *) source; - break; - - case CORBA::tk_short: - case CORBA::tk_ushort: - *(CORBA::Short *) dest = *(CORBA::Short *) source; - break; - - case CORBA::tk_wchar: - *(CORBA::WChar *) dest = *(CORBA::WChar *) source; - break; - - case CORBA::tk_long: - case CORBA::tk_ulong: - case CORBA::tk_float: - *(CORBA::Long *) dest = *(CORBA::Long *) source; - break; - - case CORBA::tk_longlong: - case CORBA::tk_ulonglong: - case CORBA::tk_double: - *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source; - break; - - case CORBA::tk_longdouble: - *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source; - break; - - case CORBA::tk_boolean: - *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source; - break; - - case CORBA::tk_any: - (void) new (dest) CORBA_Any (*(CORBA_Any*) source); - break; - - case CORBA::tk_TypeCode: - if ((*(CORBA::TypeCode_ptr *) source) != 0) - dest = source; - else - dest = CORBA::_tc_null; - ((CORBA::TypeCode_ptr) dest)->AddRef (); - break; - - case CORBA::tk_Principal: - { - CORBA::Principal_ptr src, dst; - - src = *(CORBA::Principal_ptr *) source; - // @@ Andy, please make sure to check for memory failure. - dst = *(CORBA::Principal_ptr *) dest = new CORBA::Principal; - - // Principals are just opaque IDs ... copy them - - assert (src->id.length <= UINT_MAX); - dst->id.length = dst->id.maximum = src->id.length; - - if (dst->id.length > 0) - { - // @@ Andy, please make sure to check for memory failure. - dst->id.buffer = new CORBA::Octet [(unsigned) dst->id.length]; - ACE_OS::memcpy (dst->id.buffer, src->id.buffer, - (size_t) dst->id.length); - } - else - dst->id.buffer = 0; - } - break; - - case CORBA::tk_objref: - *(CORBA::Object_ptr *) dest = - CORBA::Object::_duplicate (*(CORBA::Object_ptr *) source); - break; - - case CORBA::tk_sequence: - { - CORBA::OctetSeq *src, *dst; - CORBA::TypeCode_ptr tcp; - size_t size; - - // Rely on binary format of sequences -- all are the same - // except for the type pointed to by "buffer" - - src = (CORBA::OctetSeq *) source; - dst = (CORBA::OctetSeq *) dest; - - assert (src->length <= UINT_MAX); - dst->length = dst->maximum = src->length; - - // Get the size of each "buffer" element - - tcp = tc->typecode_param (0, env); - - if (env.exception () != 0) - { - retval = CORBA::TypeCode::TRAVERSE_STOP; - break; - } - - size = tcp->size (env); - - if (env.exception () != 0) - { - retval = CORBA::TypeCode::TRAVERSE_STOP; - break; - } - tcp->Release (); - - // Now allocate a new (uninitialized) buffer of the right size - // to hold that many elements ... fall through and let a - // general traverse fill in those buffer elements. - - size *= (size_t) src->length; - dst->buffer = new CORBA::Octet[size]; - } - // FALLTHROUGH - - case CORBA::tk_struct: - case CORBA::tk_union: - case CORBA::tk_array: - case CORBA::tk_alias: - return tc->traverse (source, - dest, - (CORBA::TypeCode::VisitRoutine) deep_copy, - 0, - env); - - case CORBA::tk_except: - // Exceptions in memory have a "hidden" typecode up front, used - // to ensure that memory is appropriately freed and to hold the - // exception ID. We just copy that typecode, the traverse code - // ignores it completely. - - *(CORBA::TypeCode_ptr *) dest = *(CORBA::TypeCode_ptr *) source; - (void) (*(CORBA::TypeCode_ptr *) dest)->AddRef (); - - return tc->traverse (source, - dest, - (CORBA::TypeCode::VisitRoutine) deep_copy, - 0, - env); - - case CORBA::tk_enum: - *(int *) dest = *(int *) source; - break; - - case CORBA::tk_string: - *(CORBA::String *) dest = - CORBA::string_copy (*(CORBA::String *) source); - break; - - case CORBA::tk_wstring: - *(CORBA::WString *) dest = - CORBA::wstring_copy (*(CORBA::WString *) source); - break; - - default: - dmsg ("deep copy default case ?"); - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO) ); - retval = CORBA::TypeCode::TRAVERSE_STOP; - break; - } - return retval; -} - -// Copy constructor for "Any". - -CORBA_Any::CORBA_Any (const CORBA_Any &src) - : type_ (src.type_ != 0 ? src.type_ : CORBA::_tc_null), - orb_owns_data_ (CORBA::B_TRUE), - refcount_ (1) -{ - CORBA::Environment env; - size_t size; - - this->type_->AddRef (); - - size = this->type_->size (env); // XXX check error status - this->value_ = (char *) calloc (1, size); - -#if 0 - // @@ Andy, can we remove this code if its not needed? - (void) this->type_->traverse (src.value_, - value_, - (CORBA::TypeCode::VisitRoutine) deep_copy, - 0, - env); -#endif /* replaced by our optimizations */ - - (void) DEEP_COPY (this->type_, src.value_, this->value_, env); -} - -//a&a : Added on 14 feb 1998 - -CORBA_Any & -CORBA_Any::operator= (const CORBA_Any &src) -{ - CORBA::Environment env; - size_t size; - - if (this == &src) - { - this->AddRef (); - return *this; - } - - if (this->orb_owns_data_) - DEEP_FREE (this->type_, this->value_, 0, env); - - // @@ Andy, can we remove this code if it's not needed? - // this->Release (); // release any value + typecode we may have - - // Now copy the contents of the source to ourselves. - this->type_ = (src.type_) != 0 ? src.type_ : CORBA::_tc_null; - - this->orb_owns_data_ = CORBA::B_TRUE; - this->refcount_ = 1; - - this->type_->AddRef (); - - size = this->type_->size (env); // XXX check error status - this->value_ = (char *) calloc (1, size); - (void) DEEP_COPY (this->type_, src.value_, this->value_, env); - return *this; -} - -// Helper routine for "Any" destructor. -// -// This frees all the memory pointed to by any given value held inside -// of an "Any". For most data types it does nothing, since most data -// types don't hold any memory. For a few, it recurses. -// -// This is one of the simplest typecode interpreter callbacks, since -// in most cases it does nothing. Also, it uses neither the second -// value nor the context parameter. - -static CORBA::TypeCode::traverse_status -deep_free (CORBA::TypeCode_ptr tc, - const void *value, - const void *, // value2 unused - void *, // context unused - CORBA::Environment &env) -{ - // Don't do anything if the value is a null pointer. - - if (!value) - return CORBA::TypeCode::TRAVERSE_CONTINUE; - - CORBA::TypeCode::traverse_status retval; - CORBA::TCKind my_kind; - - if (!tc) - { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO) ); - return CORBA::TypeCode::TRAVERSE_STOP; - } - - my_kind = tc->kind (env); - - if (env.exception_type () != CORBA::NO_EXCEPTION) - return CORBA::TypeCode::TRAVERSE_STOP; - - // Free only embedded pointers ... which don't exist in most - // primitive types. - - retval = CORBA::TypeCode::TRAVERSE_CONTINUE; - switch (my_kind) - { - case CORBA::tk_struct: - case CORBA::tk_union: - case CORBA::tk_array: - case CORBA::tk_alias: - return tc->traverse (value, - 0, - (CORBA::TypeCode::VisitRoutine) deep_free, - 0, - env); - - // XXX: Exceptions are currently leaked because of bugs lurking - // in this area. Keep in mind that there are two things to - // free: (a) the typecode in the exception base class; (b) any - // pointers held by a user-defined exception, such as an objref - // or string. - // - // Since this code does nothing, it should leak BOTH of those - // kinds of memory. Since it's not supposed to be called except - // when the exception really is being freed, it should only be - // called when the reference count in the exception base class - // is zero. - // - // It's not clear which of those assertions actually hold. - // - // The code SHOULD be just like the traverse () call for a - // structure, with (a) a precondition that the reference count - // is zero, (b) an assertion that the typecode in the exception - // and "tc" are equivalent, (c) releasing that typecode found - // within the exception. - // - case CORBA::tk_except: - return retval; - - case CORBA::tk_sequence: - retval = tc->traverse (value, - 0, - (CORBA::TypeCode::VisitRoutine) deep_free, - 0, - env); - // @@ This better be allocated via new[]. - // - // @@ (ANDY) I'm not sure what to do here...should I delete the - // value? It seems that the DTOR for the sequence will insure - // that this buffer goes away. - delete [] ((CORBA::OctetSeq *) value)->buffer; - break; - - case CORBA::tk_TypeCode: - if ((*(CORBA::TypeCode_ptr *) value) != 0) - (*(CORBA::TypeCode_ptr *) value)->Release (); - break; - - case CORBA::tk_Principal: - CORBA::release (*(CORBA::Principal_ptr *) value); - break; - - case CORBA::tk_objref: - CORBA::release (*(CORBA::Object_ptr *) value); - break; - - case CORBA::tk_string: - CORBA::string_free (*(CORBA::String *) value); - *(CORBA::String *)value = 0; - break; - - case CORBA::tk_wstring: - CORBA::wstring_free (*(CORBA::WString *) value); - *(CORBA::WString *)value = 0; - break; - - case CORBA::tk_any: -#ifdef __BORLANDC__ - // XXX BC++ doesn't yet accept explicit calls to destructors - // with this syntax. A simple workaround must exist, though; - // other explicit destructor calls work. - - dmsg ("Delete Any-in-Any ... memory leak with BC++ 4.5"); -#else - ((CORBA_Any *) value)->~CORBA_Any (); -#endif /* __BORLANDC__ */ - break; - - default: - return CORBA::TypeCode::TRAVERSE_CONTINUE; - } - - if (env.exception_type () != CORBA::NO_EXCEPTION) - return CORBA::TypeCode::TRAVERSE_STOP; - else - return retval; -} - -// Destructor for an "Any" deep-frees memory if needed. -// -// NOTE that the assertion below will fire on application programmer -// errors, such as using AddRef/Release out of sync with the true -// lifetime of an Any value allocated on the stack. BUT it involves -// changing the refcounting policy so that it's initialized to zero, -// not one ... which policy affects the whole source base, and not -// just this data type. Get to this later. - -CORBA_Any::~CORBA_Any (void) -{ - CORBA::Environment env; - - // assert (this->refcount_ == 0); - - if (this->orb_owns_data_) - // @@ Andy, do we still need the deep_free() function call? If - // not, can we remove it? - // (void) deep_free (type_, value_, 0, 0, env); - DEEP_FREE (this->type_, this->value_, 0, env); - // @@ Andy, is the following comment still true? If not, can we remove it? - - // TODO: This crashes the server on NT, apparently the previous - // DEEP_FREE does the job and make the delete operator uneeded. - // delete value_; - - if (this->type_) - this->type_->Release (); -} - -// All-at-once replacement of the contents of an "Any." - -void -CORBA_Any::replace (CORBA::TypeCode_ptr tc, - const void *v, - CORBA::Boolean orb_owns_data, - CORBA::Environment &env) -{ - if (this->orb_owns_data_) - { - // @@ Andy, do we still need the deep_free() function call? If - // not, can we remove it? - // (void) deep_free (type_, value_, 0, 0, env); - if (value_) - DEEP_FREE (this->type_, this->value_, 0, env); - // @@ Andy, is this delete ok? The one in the destructor is - // commented out... - delete this->value_; - } - - if (this->type_ != 0) - this->type_->Release (); - - env.clear (); - - this->type_ = tc; - tc->AddRef (); - this->value_ = (void *) v; - this->orb_owns_data_ = orb_owns_data; -} - -// insertion of from_string -void -CORBA_Any::operator<<= (from_string s) -{ - // If the inserted string is bounded, we create a typecode. - static CORBA::Long _oc_string [] = - { // CDR typecode octets - TAO_ENCAP_BYTE_ORDER, // native endian + padding; "tricky" - 0 // ... unbounded string to start with - }; - - CORBA::TypeCode_ptr tc = 0; - if (s.bound_ > 0) - { - // Bounded string. - _oc_string [1] = s.bound_; - ACE_NEW (tc, CORBA::TypeCode (CORBA::tk_string, - sizeof _oc_string, - (char *) &_oc_string, - CORBA::B_TRUE)); - } - else - tc = CORBA::_tc_string; // unbounded. - - if (s.nocopy_) - this->replace (tc, new char* (s.val_), CORBA::B_TRUE); - else // copying - this->replace (tc, new char* (CORBA::string_dup (s.val_)), - CORBA::B_TRUE); -} - -// Extraction: these are safe and hence we have to check that the -// typecode of the Any is equal to the one we are trying to extract -// into - -CORBA::Boolean -CORBA_Any::operator>>= (CORBA::Short &s) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_short, env)) - { - s = *(CORBA::Short *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (CORBA::UShort &s) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_ushort, env)) - { - s = *(CORBA::UShort *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (CORBA::Long &l) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_long, env)) - { - l = *(CORBA::Long *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (CORBA::ULong &l) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_ulong, env)) - { - l = *(CORBA::ULong *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (CORBA::Float &f) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_float, env)) - { - f = *(CORBA::Float *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (CORBA::Double &d) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_double, env)) - { - d = *(CORBA::Double *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (CORBA::Any &a) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_any, env)) - { - a = *(CORBA::Any *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (char *&s) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_string, env)) - { - s = *(char **) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -// = extraction into the special types - -CORBA::Boolean -CORBA_Any::operator>>= (to_boolean b) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_boolean, env)) - { - b.ref_ = *(CORBA::Boolean *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (to_octet o) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_octet, env)) - { - o.ref_ = *(CORBA::Octet *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (to_char c) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_char, env)) - { - c.ref_ = *(CORBA::Char *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (to_string s) const -{ - CORBA::Environment env; - - // The typecode must be equal. Since we do not readily have access - // to the typecode of the string into which we want to retrieve, we - // emulate the behavior of "equal" - if (this->type_->kind (env) == CORBA::tk_string) - { - CORBA::ULong bound = this->type_->length (env); - if (s.bound_ == bound) // bounds are same - { - s.val_ = *(char **) this->value_; - return CORBA::B_TRUE; - } - } - - // Otherwise. - return CORBA::B_FALSE; -} - -CORBA::Boolean -CORBA_Any::operator>>= (to_object obj) const -{ - CORBA::Environment env; - - if (this->type_->equal (CORBA::_tc_Object, env)) - { - obj.ref_ = *(CORBA::Object_ptr *) this->value_; - return CORBA::B_TRUE; - } - else - return CORBA::B_FALSE; -} - -CORBA::ULong -CORBA_Any::AddRef (void) -{ - return ++refcount_; -} - -CORBA::ULong -CORBA_Any::Release (void) -{ - { - ACE_ASSERT (this != 0); - - if (--refcount_ != 0) - return refcount_; - } - - delete this; - return 0; -} - -// ---------------------------------------------------------------------- -// Any_var type -// ---------------------------------------------------------------------- - -CORBA::Any_var & -CORBA_Any_var::operator= (CORBA::Any *p) -{ - if (this->ptr_ != p) - { - if (this->ptr_ != 0) - delete (this->ptr_); - - this->ptr_ = p; - } - return *this; -} - -CORBA::Any_var & -CORBA_Any_var::operator= (const CORBA::Any_var& r) -{ - if (this->ptr_ != 0) - delete (this->ptr_); - - this->ptr_ = new CORBA::Any (*r.ptr_); - return *this; -} diff --git a/TAO/tao/any.h b/TAO/tao/any.h deleted file mode 100644 index 18ce318f642..00000000000 --- a/TAO/tao/any.h +++ /dev/null @@ -1,343 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// any.h -// -// = DESCRIPTION -// Header file for Win32 C/C++/COM interface to CORBA's "Any" type. -// -// = AUTHOR -// Copyright 1994-1995 by Sun Microsystems, Inc. -// -// Remaining CORBA compliant functions added by Aniruddha Gokhale -// -// ============================================================================ - -#if !defined (TAO_ANY_H) -#define TAO_ANY_H - -class TAO_Export CORBA_Any -{ - // = TITLE - // Class "Any" can wrap values of any type, with the assistance - // of a TypeCode to describe that type. - // - // = DESCRIPTION - // XXX should find a way to make its memory allocation always go - // within the appropriate OLE heap... -public: - // = Minor codes for exceptional returns - enum - { - UNINITIALIZED_type = 0xf000, - VALUE_WITHOUT_TYPE, - UNSUPPORTED_OPERATION - }; - - // = Initialization and termination operations. - CORBA_Any (void); - // Default constructor. - - CORBA_Any (CORBA::TypeCode_ptr type, - void *value = 0, - CORBA::Boolean orb_owns_data = CORBA::B_FALSE); - // Constructor. - - CORBA_Any (const CORBA_Any &a); - // Copy constructor. - - ~CORBA_Any (void); - // Destructor. - - CORBA_Any &operator= (const CORBA_Any &); - // assignment operator - - // = NOTE: 94-9-14 has assignment operator plus many insertion, as - // specified below. - - // =type safe insertion - - void operator<<= (CORBA::Short); - // insert a short - - void operator<<= (CORBA::UShort); - // insert an unsigned short - - void operator<<= (CORBA::Long); - // insert a long - - void operator<<= (CORBA::ULong); - // insert an unsigned long - - void operator<<= (CORBA::Float); - // insert a float - - void operator<<= (CORBA::Double); - // insert a double - - void operator<<= (const CORBA_Any&); - // insert an Any - - void operator<<= (const char*); - // insert unbounded strings - - // =type safe extraction - - CORBA::Boolean operator>>= (CORBA::Short&) const; - // extract a short - - CORBA::Boolean operator>>= (CORBA::UShort&) const; - // extract an unsigned short - - CORBA::Boolean operator>>= (CORBA::Long&) const; - // extract a long - - CORBA::Boolean operator>>= (CORBA::ULong&) const; - // extract an unsigned long - - CORBA::Boolean operator>>= (CORBA::Float&) const; - // extract a float - - CORBA::Boolean operator>>= (CORBA::Double&) const; - // extract a double - - CORBA::Boolean operator>>= (CORBA_Any&) const; - // extract an Any - - CORBA::Boolean operator>>= (char*&) const; - // extract an unbounded string - - // = Special types. - - // These are needed for insertion and extraction of booleans, - // octets, chars, and bounded strings. - - struct from_boolean - { - from_boolean (CORBA::Boolean b); - CORBA::Boolean val_; - }; - - struct from_octet - { - from_octet (CORBA::Octet o); - CORBA::Octet val_; - }; - - struct from_char - { - from_char (CORBA::Char c); - CORBA::Char val_; - }; - - struct from_string - { - from_string (char* s, CORBA::ULong b, - CORBA::Boolean nocopy = CORBA::B_FALSE); - char *val_; - CORBA::ULong bound_; - CORBA::Boolean nocopy_; - }; - - void operator<<= (from_boolean); - // insert a boolean - - void operator<<= (from_char); - // insert a char - - void operator<<= (from_octet); - // insert an octet - - void operator<<= (from_string); - // insert a bounded string - - // = Special types. - - // These extract octets, chars, booleans, bounded strings, and - // object references - - struct to_boolean - { - to_boolean (CORBA::Boolean &b); - CORBA::Boolean &ref_; - }; - - struct to_char - { - to_char (CORBA::Char &c); - CORBA::Char &ref_; - }; - - struct to_octet - { - to_octet (CORBA::Octet &o); - CORBA::Octet &ref_; - }; - - struct to_string - { - to_string (char *&s, CORBA::ULong b); - char *&val_; - CORBA::ULong bound_; - }; - - struct to_object - { - to_object (CORBA::Object_ptr &obj); - CORBA::Object_ptr &ref_; - }; - - // extraction of the special types - CORBA::Boolean operator>>= (to_boolean) const; - CORBA::Boolean operator>>= (to_octet) const; - CORBA::Boolean operator>>= (to_char) const; - CORBA::Boolean operator>>= (to_string) const; - CORBA::Boolean operator>>= (to_object) const; - - // = ALLOCATION - void *operator new (size_t, const void *p); - // Placement new. - void *operator new (size_t s); - // Default new. - void operator delete (void *p); - // Default delete - - void replace (CORBA::TypeCode_ptr type, - const void *value, - CORBA::Boolean orb_owns_data, - CORBA::Environment &env); - // Replace the current typecode and data with the specified one - - // unsafe. - - CORBA::TypeCode_ptr type (void) const; - // Return TypeCode of the element stored in the Any. - - const void *value (void) const; - // Returns 0 if the Any has not been assigned a value, following the - // CORBA spec (TODO: give a reference) it returns a non-zero value - // otherwise. TAO does *not* guarantee that this value may be casted - // to the contained type safely. - - // = Memory management methods. - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); - -private: - CORBA::TypeCode_ptr type_; - // Typecode for the <Any>. - - void *value_; - // Value for the <Any>. - - CORBA::Boolean orb_owns_data_; - // Flag that indicates the ORB is responsible for deleting the data. - - CORBA::ULong refcount_; - // Reference count the <Any> to reduce copying costs. - - void replace (CORBA::TypeCode_ptr type, - const void *value, - CORBA::Boolean orb_owns_data); - // Helper for extraction operators that don't pass an environment - // parameter. - - // 94-9-14 hides unsigned char insert/extract - void operator<<= (unsigned char); - CORBA::Boolean operator>>= (unsigned char&) const; -}; - -class TAO_Export CORBA_Any_var -{ - // = TITLE - // Provide for automatic storage deallocation on going out of - // scope. -public: - CORBA_Any_var (void); - // default constructor - - CORBA_Any_var (CORBA_Any *a); - // construct from an Any pointer - - CORBA_Any_var (const CORBA_Any_var &a); - // copy constructor - - ~CORBA_Any_var (void); - // destructor - - CORBA_Any_var &operator= (CORBA_Any *a); - // assignment from a pointer to Any - - CORBA_Any_var &operator= (const CORBA_Any_var &a); - // assignment from an Any_var - - CORBA_Any *operator-> (void); - // arrow operator (smart pointer) - - operator const CORBA_Any *() const; - // cast - - operator CORBA_Any *&(); - // cast - - const CORBA_Any &in (void) const; - // for in Any parameter - - CORBA_Any &inout (void); - // for inout Any parameter - - CORBA_Any *&out (void); - // for out Any parameter - - CORBA_Any *_retn (void); - // for Any return types - -private: - CORBA_Any *ptr_; - // Holds the Any. -}; - -class TAO_Export CORBA_Any_out - // = TITLE - // @@ (ANDY) Please document me. -{ -public: - // = operations. - - CORBA_Any_out (CORBA_Any *&p); - // construction from a reference to a CORBA_Any - - CORBA_Any_out (CORBA_Any_var &p); - // construction from a var - - CORBA_Any_out (CORBA_Any_out &s); - // copy constructor - - CORBA_Any_out &operator= (CORBA_Any_out &s); - // assignment from a CORBA_Any_out - - CORBA_Any_out &operator= (CORBA_Any *p); - // assignment from a CORBA_Any - - CORBA_Any_out &operator= (const CORBA_Any *p); - // assignment from a const CORBA_Any - - operator CORBA_Any *&(); - // cast - - CORBA_Any *& ptr (void); - // return underlying instance - -private: - CORBA_Any *&ptr_; - // Instance - - void operator= (const CORBA_Any_var &); - // assignment from _var disallowed -}; - -#endif /* TAO_ANY_H */ diff --git a/TAO/tao/any.i b/TAO/tao/any.i deleted file mode 100644 index 2b4e36a6afd..00000000000 --- a/TAO/tao/any.i +++ /dev/null @@ -1,293 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -ACE_INLINE void * -CORBA_Any::operator new (size_t, const void *p) -{ - return (void *) p; -} - -ACE_INLINE void * -CORBA_Any::operator new (size_t s) -{ - return ::operator new (s); -} - -ACE_INLINE void -CORBA_Any::operator delete (void *p) -{ - ::operator delete (p); -} - -// Insertion from special types. - -// @@ Andy, please take a look at this method and make sure it's what -// you intended. I couldn't find it defined anywhere. --cjc -ACE_INLINE void -CORBA_Any::replace (CORBA::TypeCode_ptr type, - const void *value, - CORBA::Boolean orb_owns_data) -{ - CORBA_Environment e; - this->replace (type, value, orb_owns_data, e); -} - -// insertion operators - -ACE_INLINE void -CORBA_Any::operator<<= (CORBA::Short s) -{ - this->replace (CORBA::_tc_short, new CORBA::Short (s), CORBA::B_TRUE); -} - -ACE_INLINE void -CORBA_Any::operator<<= (CORBA::UShort s) -{ - this->replace (CORBA::_tc_ushort, new CORBA::UShort (s), CORBA::B_TRUE); -} - -ACE_INLINE void -CORBA_Any::operator<<= (CORBA::Long l) -{ - this->replace (CORBA::_tc_long, new CORBA::Long (l), CORBA::B_TRUE); -} - -ACE_INLINE void -CORBA_Any::operator<<= (CORBA::ULong l) -{ - this->replace (CORBA::_tc_ulong, new CORBA::ULong (l), CORBA::B_TRUE); -} - -ACE_INLINE void -CORBA_Any::operator<<= (CORBA::Float f) -{ - this->replace (CORBA::_tc_float, new CORBA::Float (f), CORBA::B_TRUE); -} - -ACE_INLINE void -CORBA_Any::operator<<= (CORBA::Double d) -{ - this->replace (CORBA::_tc_double, new CORBA::Double (d), CORBA::B_TRUE); -} - -ACE_INLINE void -CORBA_Any::operator<<= (const CORBA_Any& a) -{ - this->replace (CORBA::_tc_any, new CORBA_Any (a), CORBA::B_TRUE); -} - -// this is a copying version for unbounded strings -ACE_INLINE void -CORBA_Any::operator<<= (const char* s) -{ - this->replace (CORBA::_tc_string, new char* (CORBA::string_dup (s)), - CORBA::B_TRUE); -} - -// implementing the special types -ACE_INLINE -CORBA_Any::from_boolean::from_boolean (CORBA::Boolean b) - : val_ (b) -{ -} - -ACE_INLINE -CORBA_Any::to_boolean::to_boolean (CORBA::Boolean &b) - : ref_ (b) -{ -} - -ACE_INLINE -CORBA_Any::from_octet::from_octet (CORBA::Octet o) - : val_ (o) -{ -} - -ACE_INLINE -CORBA_Any::to_octet::to_octet (CORBA::Octet &o) - : ref_ (o) -{ -} - -ACE_INLINE -CORBA_Any::from_char::from_char (CORBA::Char c) - : val_ (c) -{ -} - -ACE_INLINE -CORBA_Any::to_char::to_char (CORBA::Char &c) - : ref_ (c) -{ -} - -ACE_INLINE -CORBA_Any::from_string::from_string (char *s, - CORBA::ULong b, - CORBA::Boolean nocopy) - : val_ (s), - bound_ (b), - nocopy_ (nocopy) -{ -} - -ACE_INLINE -CORBA_Any::to_string::to_string (char *&s, - CORBA::ULong b) - : val_ (s), - bound_ (b) -{ -} - -ACE_INLINE -CORBA_Any::to_object::to_object (CORBA::Object_ptr &obj) - : ref_ (obj) -{ -} - -ACE_INLINE void -CORBA_Any::operator<<= (from_boolean b) -{ - this->replace (CORBA::_tc_boolean, new CORBA::Boolean (b.val_), CORBA::B_TRUE); -} - -ACE_INLINE void -CORBA_Any::operator<<= (from_octet o) -{ - this->replace (CORBA::_tc_octet, new CORBA::Octet (o.val_), CORBA::B_TRUE); -} - -ACE_INLINE void -CORBA_Any::operator<<= (from_char c) -{ - this->replace (CORBA::_tc_char, new CORBA::Char (c.val_), CORBA::B_TRUE); -} - -// ---------------------------------------------------------------------- -// CORBA_Any_var type -// ---------------------------------------------------------------------- - -ACE_INLINE -CORBA_Any_var::CORBA_Any_var (void) - : ptr_ (0) -{ -} - -ACE_INLINE -CORBA_Any_var::CORBA_Any_var (CORBA_Any *p) - : ptr_ (p) -{ -} - -ACE_INLINE -CORBA_Any_var::CORBA_Any_var (const CORBA_Any_var& r) - : ptr_ (new CORBA::Any (*r.ptr_)) -{ -} - -ACE_INLINE -CORBA_Any_var::~CORBA_Any_var (void) -{ - delete this->ptr_; -} - -ACE_INLINE -CORBA_Any_var::operator CORBA_Any *&() -{ - return this->ptr_; -} - -ACE_INLINE -CORBA_Any_var::operator const CORBA_Any *() const -{ - return this->ptr_; -} - -ACE_INLINE CORBA::Any * -CORBA_Any_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE const CORBA_Any & -CORBA_Any_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE CORBA_Any & -CORBA_Any_var::inout (void) -{ - return *this->ptr_; -} - -ACE_INLINE CORBA_Any *& -CORBA_Any_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE CORBA_Any * -CORBA_Any_var::_retn (void) -{ - CORBA_Any *temp = this->ptr_; - this->ptr_ = 0; - return temp; -} - -// ---------------------------------------------------------------------- -// CORBA_Any_out type -// ---------------------------------------------------------------------- - -ACE_INLINE -CORBA_Any_out::CORBA_Any_out (CORBA_Any *&s) - : ptr_ (s) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA_Any_out::CORBA_Any_out (CORBA_Any_var &s) - : ptr_ (s.out ()) -{ -} - -ACE_INLINE -CORBA_Any_out::CORBA_Any_out (CORBA_Any_out &s) - : ptr_ (s.ptr_) -{ -} - -ACE_INLINE CORBA_Any_out & -CORBA_Any_out::operator= (CORBA_Any_out &s) -{ - this->ptr_ = s.ptr_; - return *this; -} - -ACE_INLINE CORBA_Any_out & -CORBA_Any_out::operator= (CORBA_Any *s) -{ - this->ptr_ = s; - return *this; -} - -ACE_INLINE CORBA_Any_out & -CORBA_Any_out::operator= (const CORBA_Any *s) -{ - this->ptr_ = new CORBA::Any (*s); - return *this; -} - -ACE_INLINE -CORBA_Any_out::operator CORBA_Any *&() -{ - return this->ptr_; -} - -ACE_INLINE CORBA_Any *& -CORBA_Any_out::ptr (void) -{ - return this->ptr_; -} diff --git a/TAO/tao/arg_shifter.cpp b/TAO/tao/arg_shifter.cpp deleted file mode 100644 index c142a9344c6..00000000000 --- a/TAO/tao/arg_shifter.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// $Id$ - -#include "arg_shifter.h" - -Arg_Shifter::Arg_Shifter (int &argc, char **argv, char **temp) - : argc_ (argc), - total_size_ (argc), - temp_ (temp), - argv_ (argv), - current_index_ (0), - back_ (argc - 1), - front_ (0) -{ - // If not provided with one, allocate a temporary array. - if (this->temp_ == 0) - this->temp_ = new char *[this->total_size_]; - - if (this->temp_ != 0) - { - // Fill the temporary array. - this->argc_ = 0; - for (int i = 0; i < this->total_size_; i++) - { - this->temp_[i] = this->argv_[i]; - this->argv_[i] = 0; - } - } - else - { - // Allocation failed, prohibit iteration. - this->current_index_ = this->argc_; - this->front_ = this->argc_; - } -} - -Arg_Shifter::~Arg_Shifter (void) -{ - // Delete the temporary vector. - delete [] temp_; -} - -char * -Arg_Shifter::get_current (void) const -{ - char *return_value = 0; - - if (this->is_anything_left ()) - return_value = this->temp_[current_index_]; - - return return_value; -} - -int -Arg_Shifter::consume_arg (int number) -{ - int return_value = 0; - - // Stick knowns at the end of the vector (consumed). - if (this->is_anything_left() >= number) - { - for (int i = 0, j = this->back_ - (number - 1); - i < number; - i++, j++, this->current_index_++) - this->argv_[j] = this->temp_[this->current_index_]; - - this->back_ -= number; - return_value = 1; - } - - return return_value; -} - -int -Arg_Shifter::ignore_arg (int number) -{ - int return_value = 0; - - // Keep unknowns at the head of the vector. - if (this->is_anything_left () >= number) - { - for (int i = 0; - i < number; - i++, this->current_index_++, this->front_++) - this->argv_[this->front_] = this->temp_[this->current_index_]; - - return_value = 1; - this->argc_ += number; - } - - return return_value; -} - -int -Arg_Shifter::is_anything_left (void) const -{ - return this->total_size_ - this->current_index_; -} - -int -Arg_Shifter::is_option_next (void) const -{ - return this->is_anything_left () && - this->temp_[this->current_index_][0] == '-'; -} - -int -Arg_Shifter::is_parameter_next (void) const -{ - return this->is_anything_left () - && this->temp_[this->current_index_][0] != '-'; -} - -int -Arg_Shifter::num_ignored_args (void) const -{ - return this->front_; -} diff --git a/TAO/tao/arg_shifter.h b/TAO/tao/arg_shifter.h deleted file mode 100644 index faf2fb1d7a4..00000000000 --- a/TAO/tao/arg_shifter.h +++ /dev/null @@ -1,98 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -// ======================================================================== -// -// = LIBRARY -// TAO -// -// = FILENAME -// arg_shifter -// -// = AUTHOR -// Seth Widoff -// -// = VERSION -// $Id$ -// ======================================================================== - -#if !defined (TAO_ARG_SHIFTER_H) -#define TAO_ARG_SHIFTER_H - -class Arg_Shifter -{ - // = TITLE - // This ADT shifts known args to the back of the argv vector, so - // deeper levels of argument parsing can locate the yet - // unprocessed arguments at the beginning of the vector. - // - // = DESCRIPTION - // The Arg_Shifter copies the pointers of the argv vector into a - // temporary array. As the Arg_Shifter iterates over the temp, is - // places known arguments in the rear of the argv and unknown - // ones in the beginning. So, after having visited all the - // arguments in the temp vector, Arg_Shifter has placed all the - // unknown arguments in their original order at the front of - // argv. -public: - Arg_Shifter (int &argc, char **argv, char **temp = 0); - // Initialize the Arg_Shifter to the vector over which to iterate, - // also providing the temporary array if the client doesn't want the - // arg_shifter to dynamically allocate its own. If internal dynamic - // allocation fails, the Arg_Shifter will set all the indices to the - // end of the vector, forbidding iteration. Following iteration over - // argv, the argc value will contain the number of unconsumed - // arguments. - - ~Arg_Shifter (void); - - char *get_current (void) const; - // Get the current head of the vector. - - int consume_arg (int number = 1); - // Consume <number> argument(s) by sticking them/it on the end of - // the vector. - - int ignore_arg (int number = 1); - // Place <number> arguments in the same relative order ahead of the - // known arguemnts in the vector. - - int is_anything_left (void) const; - // Returns the number of args left to see in the vector. - - int is_option_next (void) const; - // Returns 1 if there's a next item in the vector and it begins with - // '-'. - - int is_parameter_next (void) const; - // Returns 1 if there's a next item in the vector and it doesn't - // begin with '-'. - - int num_ignored_args (void) const; - // Returns the number of irrelevant args seen. - -private: - int &argc_; - // The size of the argument vector. - - int total_size_; - // The size of argv_. - - char **temp_; - // The temporary array over which we traverse. - - char **argv_; - // The array in which the arguments are reordered. - - int current_index_; - // The element in <temp_> we're currently examining. - - int back_; - // The index of <argv_> in which we'll stick the next unknown - // argument. - - int front_; - // The index of <argv_> in which we'll stick the next known - // argument. -}; - -#endif /* TAO_ARG_SHIFTER_H */ diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h index 63533771c0e..c10693a2505 100644 --- a/TAO/tao/default_server.h +++ b/TAO/tao/default_server.h @@ -18,8 +18,7 @@ # define TAO_DEFAULT_SERVER_FACTORY_H #include "tao/corba.h" - -#include "tao/strategy_T.h" +#include "tao/ORB_Strategies_T.h" class TAO_Default_Server_Strategy_Factory : public TAO_Server_Strategy_Factory { diff --git a/TAO/tao/nvlist.cpp b/TAO/tao/nvlist.cpp deleted file mode 100644 index ee99cd94504..00000000000 --- a/TAO/tao/nvlist.cpp +++ /dev/null @@ -1,297 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// nvlist.cpp -// -// = AUTHOR -// @ (#)nvlist.cpp -// 1.6 95/11/04 -// -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// and -// Aniruddha Gokhale (additions, missing operations) -// -// ============================================================================ - -// Implementation of Named Value List and NamedValue classes - -#include "tao/corba.h" - - -// =Methods on class NamedValue - -CORBA::ULong -CORBA_NamedValue::AddRef (void) -{ - return refcount_++; -} - -CORBA::ULong -CORBA_NamedValue::Release (void) -{ - { - ACE_ASSERT (this != 0); - - if (--this->refcount_ != 0) - return this->refcount_; - } - - // delete this; - // this is causing free mismatched memory error - this->~CORBA_NamedValue (); - ACE_OS::free (this); - return 0; -} - -// Reference counting for DII Request object - -void -CORBA::release (CORBA::NamedValue_ptr nv) -{ - if (nv) - nv->Release (); -} - -CORBA::Boolean -CORBA::is_nil (CORBA::NamedValue_ptr nv) -{ - return (CORBA::Boolean) (nv == 0); -} - -CORBA_NamedValue::~CORBA_NamedValue (void) -{ - if (this->name_) - { - CORBA::string_free (this->name_); - this->name_ = 0; - } - // the Any will be destroyed on its own as we hold an instance and not a - // pointer to Any -} - - -// =Methods on class NVList - -CORBA::ULong -CORBA_NVList::AddRef (void) -{ - return this->refcount_++; -} - -CORBA::ULong -CORBA_NVList::Release (void) -{ - { - ACE_ASSERT (this != 0); - - if (--this->refcount_ != 0) - return this->refcount_; - } - - delete this; - return 0; -} - -// Reference counting for DII Request object - -void -CORBA::release (CORBA::NVList_ptr nvl) -{ - if (nvl) - nvl->Release (); -} - -CORBA::Boolean -CORBA::is_nil (CORBA::NVList_ptr nvl) -{ - return (CORBA::Boolean) (nvl == 0); -} - -CORBA_NVList::~CORBA_NVList (void) -{ - // destroy each NamedValue element - for (CORBA::ULong i = 0; i < this->max_; i++) - (&this->values_[i])->~CORBA_NamedValue (); - - if (this->values_) - ACE_OS::free ((char *)values_); - - this->values_ = 0; - this->len_ = this->max_ = 0; -} - -// add an element and just initialize its flags -CORBA::NamedValue_ptr -CORBA_NVList::add (CORBA::Flags flags, - CORBA::Environment &env) -{ - CORBA::ULong len = this->len_; // next slot - - // call the helper to allocate a NamedValue element (if necessary) - if (!this->add_element (flags, env)) - return 0; - - // now initialize the fields - this->values_[len].flags_ = flags; - return &this->values_[len]; -} - -// add an element and just initialize its flags and name -CORBA::NamedValue_ptr -CORBA_NVList::add_item (const char *name, - CORBA::Flags flags, - CORBA::Environment &env) -{ - CORBA::ULong len = this->len_; // next slot - - // call the helper to allocate a NamedValue element (if necessary) - if (!this->add_element (flags, env)) - return 0; - - // now initialize the fields - this->values_[len].flags_ = flags; - this->values_[len].name_ = CORBA::string_dup (name); - return &this->values_[len]; -} - -// add a value. If necessary, increment the list -CORBA::NamedValue_ptr -CORBA_NVList::add_value (const char *name, - const CORBA::Any &value, - CORBA::Flags flags, - CORBA::Environment &env) -{ - CORBA::ULong len = this->len_; // next slot - - // call the helper to allocate a NamedValue element (if necessary) - if (!this->add_element (flags, env)) - return 0; - - // now initialize the fields - this->values_[len].flags_ = flags; - this->values_[len].name_ = CORBA::string_dup (name); // make a copy - - if (ACE_BIT_ENABLED (flags, CORBA::IN_COPY_VALUE)) - // IN_COPY_VALUE means that the parameter is not "borrowed" by - // the ORB, but rather that the ORB copies its value. - // - // Initialize the newly allocated memory using a copy - // constructor that places the new "Any" value at just the right - // place, and makes a "deep copy" of the data. - (void) new (&this->values_[len].any_) CORBA::Any (value); - else - - // The normal behaviour for parameters is that the ORB "borrows" - // their memory for the duration of calls. - // - // Initialize the newly allocated "Any" using a normal - // constructor that places the new "Any" value at just the right - // place, yet doesn't copy the memory (except for duplicating - // the typecode). - // - // NOTE: DSI has yet to be updated so that it's OK to use such - // application-allocated memory. It needs at least a "send the - // response now" call. - // - (void) new (&this->values_[len].any_) CORBA::Any (value.type (), - (void *)value.value (), - CORBA::B_FALSE); // does - // not - // own - - // return pointer to the newly inserted member - return &this->values_[len]; -} - -// add an element and just initialize its flags and name -CORBA::NamedValue_ptr -CORBA_NVList::add_item_consume (char *name, - CORBA::Flags flags, - CORBA::Environment &env) -{ - CORBA::ULong len = this->len_; // next slot - - // call the helper to allocate a NamedValue element (if necessary) - if (!this->add_element (flags, env)) - return 0; - - // now initialize the fields - this->values_[len].flags_ = flags; - this->values_[len].name_ = name; // we consume it - return &this->values_[len]; -} - -// add a value. If necessary, increment the list -CORBA::NamedValue_ptr -CORBA_NVList::add_value_consume (char * /*name*/, - CORBA::Any * /*value*/, - CORBA::Flags /*flags*/, - CORBA::Environment &/*env*/) -{ - // not implemented because we need to see how we can consume the value - // One soln is to make the any_ member of NamedValue to be a Any_ptr or - // Any_var - // XXXASG- TODO - return 0; -} - -//CORBA::Status -void -CORBA_NVList::remove (CORBA::ULong /*n*/, CORBA::Environment &/*env*/) -{ - // not implemented - // XXXASG - TODO - -} - -// Helper method -CORBA::Boolean -CORBA_NVList::add_element (CORBA::Flags flags, CORBA::Environment &env) -{ - env.clear (); - if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT)) - { - env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO)); - return 0; - } - - // We track "len_" and "max_" like sequences do; mixing the - // "add_arg" and nvlist[i] style accessors produces undefined - // behaviour. - CORBA::ULong len = this->len_++; // len_ points to the next available - // slot. Access is by zero based indexing - - // Extend the array with an _initialized_ element ... relying on - // zeroed memory to be sufficiently initialized. - // - - if (this->values_ == 0) // list was created as an empty list - { - this->values_ = (CORBA::NamedValue_ptr) - ACE_OS::calloc (this->len_, sizeof (CORBA::NamedValue)); - this->max_ = this->len_; - } - else if (len >= max_) // need reallocation - { - // reallocate a larger buffer - this->values_ = (CORBA::NamedValue_ptr) ACE_OS::realloc - ((char *)this->values_, sizeof (CORBA::NamedValue) * this->len_); - // now zero the elements that have been newly allocated - (void) ACE_OS::memset (&this->values_[this->max_], 0, - sizeof (values_[this->max_]) * (this->len_ - this->max_)); - this->max_ = this->len_; // set the new maximum size - } - if (!this->values_) - { - env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); - return 0; - } - - return 1; // success -} diff --git a/TAO/tao/nvlist.h b/TAO/tao/nvlist.h deleted file mode 100644 index 94c601b7563..00000000000 --- a/TAO/tao/nvlist.h +++ /dev/null @@ -1,160 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// nvlist.h -// -// = AUTHOR -// Copyright 1994-1995 by Sun Microsystems Inc. -// and -// Aniruddha Gokhale (additions, missing operations) -// -// ============================================================================ - -#if !defined (TAO_NVLIST_H) -# define TAO_NVLIST_H - -class TAO_Export CORBA_NamedValue -{ - // = TITLE - // NamedValue ... these occur only in "NVList" (named value list) data - // structures. The binary form of the data structure is frozen and - // visible to programs using it (e.g. from C). The C++ class supports - // some programming discipline, e.g. to avoid memory leaks. - // - // They just represent parameters to calls. The name is optional, and - // the value is packaged as an Any. The flags indicate parameter - // mode, and some ownership rules for "top level" memory. -public: - const char *name (void) const; - // optional name - - CORBA::Any_ptr value (void) const; - // return the value - - CORBA::Flags flags (void) const; - // return the parameter mode flag - - ~CORBA_NamedValue (void); - // destructor - manages the name and value - - // = Methods required for COM IUnknown support. - - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); - -private: - u_int refcount_; - // refcount used in release - - CORBA::Any any_; - // holds the value - - CORBA::Flags flags_; - // parameter mode flags - - char *name_; - // optional IDL name of the parameter - - CORBA_NamedValue (void); - // private constructor. Cannot be directly instantiated other than by its - // friends. - - friend class CORBA_ORB; - friend class CORBA_NVList; - friend class CORBA_Request; -}; - -class TAO_Export CORBA_NVList -{ - // = TITLE - // NVList ... this is used in the (client side) DII (Dynamic - // Invocation Interface) to hold parameters, except for the return - // parameter. It's used in the same role in the (server side) DSI - // (Dynamic Skeleton Interface). - // - // = DESCRIPTION - // Each user (client, server) provides the typecode and memory for - // each parameter using an NVList, then talks to the ORB using a - // Request or ServerRequest pseudo-object. The ORB copies data - // to/from the IPC messages (e.g. IIOP::Request, IIOP::Response) - // as appropriate. -public: - ~CORBA_NVList (void); - // destructor - - CORBA::ULong count (void) const; - // return the current number of elements in the list - - CORBA::NamedValue_ptr add (CORBA::Flags, - CORBA::Environment &); - // add an element and just initialize the flags - - CORBA::NamedValue_ptr add_item (const char *, - CORBA::Flags, - CORBA::Environment &); - // add an element and initialize its name and flags - - CORBA::NamedValue_ptr add_value (const char *, - const CORBA::Any &, - CORBA::Flags, - CORBA::Environment &); - // initializes a value, name, and flags - - CORBA::NamedValue_ptr add_item_consume (char *, - CORBA::Flags, - CORBA::Environment &); - // just like add_item. In addition, memory management of char * name is taken - // over by the NVList - - CORBA::NamedValue_ptr add_value_consume (char *, - CORBA::Any_ptr, - CORBA::Flags, - CORBA::Environment &); - // just like add_value. In addition, the NVList controls the memory - // management of the char *name and Any *value parameter - - CORBA::NamedValue_ptr item (CORBA::ULong n, CORBA::Environment &env); - // retrieve the item at the nth location. Raises Bounds - - - // CORBA::Status - void remove (CORBA::ULong n, CORBA::Environment &env); - // remove element at index n. Raises Bounds - - // = Methods required for COM IUnknown support - - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); - -private: - CORBA_NVList (void); - // constructor - cannot be instantiated directly other than through the - // ORB::create_list method - - CORBA::Boolean add_element (CORBA::Flags, CORBA::Environment &); - // helper to increase the list size. This is used by all the add_ methods of - // the NVList class - - CORBA::NamedValue *values_; - // list of parameters stored as NamedValues - - CORBA::ULong max_; - // maximum length of list - - CORBA::ULong len_; - // current length of list - - CORBA::ULong refcount_; - // maintains how many references exist to this object - - friend class CORBA_ORB; - friend class CORBA_Request; -}; - -#endif /* TAO_NVLIST_H */ diff --git a/TAO/tao/nvlist.i b/TAO/tao/nvlist.i deleted file mode 100644 index 9cf97b1efcb..00000000000 --- a/TAO/tao/nvlist.i +++ /dev/null @@ -1,63 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -// constructor -ACE_INLINE -CORBA_NamedValue::CORBA_NamedValue (void) - : refcount_ (1), - flags_ (0), - name_ (0) -{ -} - -// return the name -ACE_INLINE const char* -CORBA_NamedValue::name (void) const -{ - return this->name_; -} - -// return the value -ACE_INLINE CORBA::Any_ptr -CORBA_NamedValue::value (void) const -{ - return ACE_const_cast(CORBA::Any_ptr,&this->any_); -} - -// return the flags -ACE_INLINE CORBA::Flags -CORBA_NamedValue::flags (void) const -{ - return this->flags_; -} - - -// = methods for the NVList class - -// constructor -ACE_INLINE -CORBA_NVList::CORBA_NVList (void) - : values_ (0), - max_ (0), - len_ (0), - refcount_ (1) -{ -} - -ACE_INLINE CORBA::ULong -CORBA_NVList::count (void) const -{ - return this->max_; -} - -ACE_INLINE CORBA::NamedValue_ptr -CORBA_NVList::item (CORBA::ULong n, CORBA::Environment &env) -{ - env.clear (); - if (n >= this->max_) // 0 based indexing - { - env.exception (new CORBA::TypeCode::Bounds ()); - return 0; - } - else - return &this->values_ [n]; -} diff --git a/TAO/tao/objkey.idl b/TAO/tao/objkey.idl deleted file mode 100644 index 88e781a9f6c..00000000000 --- a/TAO/tao/objkey.idl +++ /dev/null @@ -1,3 +0,0 @@ -module TAO { - typedef sequence<octet> ObjectKey; -};
\ No newline at end of file diff --git a/TAO/tao/principa.cpp b/TAO/tao/principa.cpp deleted file mode 100644 index 6d41fa07744..00000000000 --- a/TAO/tao/principa.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// @ (#)principa.cpp 1.4 95/11/04 -// Copyright 1994-1995 by Sun Microsystems Inc. -// All Rights Reserved -// -// ORB: Principal identifier pseudo-objref - -#include "tao/corba.h" - -void -CORBA::release (CORBA::Principal_ptr principal) -{ - if (principal) - principal->Release (); -} - -CORBA::Boolean -CORBA::is_nil (CORBA::Principal_ptr principal) -{ - return (CORBA::Boolean) (principal == 0); -} - -CORBA_Principal::CORBA_Principal (void) -{ -} - -CORBA_Principal::~CORBA_Principal (void) -{ - assert (refcount_ == 0); - - if (id.buffer) - delete [] id.buffer; -} - -CORBA::ULong -CORBA_Principal::AddRef (void) -{ - return ++refcount_; -} - -CORBA::ULong -CORBA_Principal::Release (void) -{ - { - if (--refcount_ != 0) - return refcount_; - } - - delete this; - return 0; -} diff --git a/TAO/tao/principa.h b/TAO/tao/principa.h deleted file mode 100644 index 252a8b2ef92..00000000000 --- a/TAO/tao/principa.h +++ /dev/null @@ -1,67 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- - -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// principa.hh -// -// = DESCRIPTION -// The CORBA_Principal pseudo-object implementation. -// -// = AUTHOR -// Copyright 1994-1995 by Sun Microsystems Inc. -// -// ============================================================================ - -#if !defined (TAO_PRINCIPAL_H) -# define TAO_PRINCIPAL_H - -class TAO_Export CORBA_Principal - // = TITLE - // A "Principal" identifies an authenticated entity in the - // network administration framework. Identities are used to - // control acccess (authorization) as well as in audit trails - // (accountability). -{ -public: - // To applications, the identifier is an opaque ID. - - // CORBA::SEQUENCE <CORBA::Octet> id; - CORBA::OctetSeq id; - - // XXX add "==", "<", ">" operators - - // Stuff required for COM IUnknown support - - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); - - CORBA_Principal (void); - -private: - CORBA::ULong refcount_; - - ~CORBA_Principal (void); - - // = these are not provided - CORBA_Principal &operator = (const CORBA::Principal_ptr &); - CORBA_Principal (const CORBA::Principal_ptr &); - -#if defined (__GNUG__) - // Maybe this should be fixed to use the ACE_CLASS_IS_NAMESPACE() - // macro? - // - // No, the intent of that macro is to state that there's no way to - // instantiate that type. However, we can definitely instantiate - // one of these, but only friends can. - // - // G++ (even 2.6.3) stupidly thinks instances can't be - // created. This de-warns. - friend class everyone_needs_a_friend; -#endif /* __GNUG__ */ -}; - -#endif /* TAO_PRINCIPAL_H */ diff --git a/TAO/tao/strategy_T.cpp b/TAO/tao/strategy_T.cpp deleted file mode 100644 index e47a8472046..00000000000 --- a/TAO/tao/strategy_T.cpp +++ /dev/null @@ -1,56 +0,0 @@ -// ============================================================================ -// -// = FILENAME -// strategy_T.cpp -// -// = AUTHOR -// Chris Cleeland -// -// = VERSION -// $Id$ -// ============================================================================ - -#include "tao/strategy_T.h" - -#if !defined (__ACE_INLINE__) -#include "tao/strategy_T.i" -#endif /* __ACE_INLINE__ */ - -template <class SH> int -TAO_Reactive_Strategy<SH>::activate_svc_handler (SH *svc_handler, void *arg) -{ - ACE_TRACE ("ACE_Reactive_Strategy<SVC_HANDLER>::activate_svc_handler"); - - ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor (); - - int result = 0; - - if (r == 0) - result = -1; - - // Register with the Reactor with the appropriate <mask>. - else if (r->register_handler (svc_handler, this->mask_) == -1) - result = -1; - - // If the implementation of the reactor uses event associations - else if (r->uses_event_associations ()) - { - // If we don't have non-block on, it won't work with - // WFMO_Reactor - // This maybe too harsh - // if (!ACE_BIT_ENABLED (this->flags_, ACE_NONBLOCK)) - // goto failure; - if (svc_handler->open ((void *) this) != -1) - return 0; - else - result = -1; - } - else - // Call up to our parent to do the SVC_HANDLER initialization. - return this->inherited::activate_svc_handler (svc_handler, arg); - - if (result == -1) - svc_handler->close (0); - - return result; -} diff --git a/TAO/tao/strategy_T.h b/TAO/tao/strategy_T.h deleted file mode 100644 index c9afa9d9c88..00000000000 --- a/TAO/tao/strategy_T.h +++ /dev/null @@ -1,44 +0,0 @@ -// This may look like C, but it's really -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// strategy_T.h -// -// = AUTHOR -// Chris Cleeland -// -// ============================================================================ - -#if !defined (TAO_STRATEGY_T_H) -# define TAO_STRATEGY_T_H - -#include "ace/Strategies_T.h" - -template <class SH> -class TAO_Reactive_Strategy : public ACE_Reactive_Strategy<SH> -{ -public: - TAO_Reactive_Strategy (void); - ~TAO_Reactive_Strategy (void); - - virtual int activate_svc_handler (SH *sh, void *arg); -}; - -#if defined (__ACE_INLINE__) -#include "tao/strategy_T.i" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "tao/strategy_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("strategy_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#endif /* TAO_STRATEGY_T_H */ diff --git a/TAO/tao/strategy_T.i b/TAO/tao/strategy_T.i deleted file mode 100644 index f5d1dba232a..00000000000 --- a/TAO/tao/strategy_T.i +++ /dev/null @@ -1,21 +0,0 @@ -// ============================================================================ -// -// = FILENAME -// strategy_T.i -// -// = AUTHOR -// Chris Cleeland -// -// = VERSION -// $Id$ -// ============================================================================ - - -template <class SH> ACE_INLINE -TAO_Reactive_Strategy<SH>::TAO_Reactive_Strategy (void) -{} - -template <class SH> ACE_INLINE -TAO_Reactive_Strategy<SH>::~TAO_Reactive_Strategy (void) -{} - |