diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-03-08 07:14:07 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-03-08 07:14:07 +0000 |
commit | 44234824ca45bd2b0d44fa31431f9725cae76495 (patch) | |
tree | 335f56d94ba20154cefe00b250e53be1890a110e /TAO | |
parent | aa8802d522162db560254418319c063d0b9be4b2 (diff) | |
download | ATCD-44234824ca45bd2b0d44fa31431f9725cae76495.tar.gz |
Sat Mar 8 07:12:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
34 files changed, 81 insertions, 40 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 011d178a9aa..103b938f91f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,44 @@ +Sat Mar 8 07:12:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/AnyTypeCode.mpc: + * tao/BiDir_GIOP.mpc: + * tao/CodecFactory.mpc: + * tao/Codeset.mpc: + * tao/Compression.mpc: + * tao/CSD_Framework.mpc: + * tao/CSD_ThreadPool.mpc: + * tao/DiffServPolicy.mpc: + * tao/DynamicAny.mpc: + * tao/DynamicInterface.mpc: + * tao/EndpointPolicy.mpc: + * tao/IFR_Client.mpc: + * tao/ImR_Client.mpc: + * tao/IORInterceptor.mpc: + * tao/IORManipulation.mpc: + * tao/IORTable.mpc: + * tao/Messaging.mpc: + * tao/ObjRefTemplate.mpc: + * tao/PI.mpc: + * tao/PI_Server.mpc: + * tao/PortableServer.mpc: + * tao/RTCORBA.mp: + * tao/RTPortableServer.mpc: + * tao/RTScheduler.mpc: + * tao/SmartProxies.mpc: + * tao/Strategies.mpc: + * tao/TC.mpc: + * tao/TC_IIOP.mpc: + * tao/TypeCodeFactory.mpc: + * tao/Valuetype.mpc: + * tao/ZlibCompressor.mpc: + Explicitly specify the project name, on VMS the filenames + are returned lower case and MPC compares project names + case sensitive. + + * tao/LocalObject.cpp: + * tao/LocalObject.h: + _repository_id must be available with CORBA/e + Fri Mar 7 13:47:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tao/BiDir_GIOP/BiDir_ORBInitializer.cpp: diff --git a/TAO/tao/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode.mpc index 08e98ea43a6..9b6d580476c 100644 --- a/TAO/tao/AnyTypeCode.mpc +++ b/TAO/tao/AnyTypeCode.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, extra_anytypecode, tao_versioning_idl_defaults, nolink_codecfactory, gen_ostream { +project(AnyTypeCode) : taolib, tao_output, install, extra_anytypecode, tao_versioning_idl_defaults, nolink_codecfactory, gen_ostream { sharedname = TAO_AnyTypeCode dynamicflags = TAO_ANYTYPECODE_BUILD_DLL diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc index e5481cdcc1a..bad9d250dd8 100644 --- a/TAO/tao/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, pi, tao_versioning_idl_defaults { +project(BiDir_GIOP) : taolib, tao_output, install, pi, tao_versioning_idl_defaults { sharedname = TAO_BiDirGIOP dynamicflags = TAO_BIDIRGIOP_BUILD_DLL diff --git a/TAO/tao/CSD_Framework.mpc b/TAO/tao/CSD_Framework.mpc index 67fd954fa1f..22fe980d240 100644 --- a/TAO/tao/CSD_Framework.mpc +++ b/TAO/tao/CSD_Framework.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, portableserver, install, pi, avoids_corba_e_micro, tao_versioning_idl_defaults { +project(CSD_Framework) : taolib, tao_output, portableserver, install, pi, avoids_corba_e_micro, tao_versioning_idl_defaults { sharedname = TAO_CSD_Framework dynamicflags = TAO_CSD_FW_BUILD_DLL includes += $(TAO_ROOT)/tao diff --git a/TAO/tao/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool.mpc index 3b718d679f6..ceb40afa827 100644 --- a/TAO/tao/CSD_ThreadPool.mpc +++ b/TAO/tao/CSD_ThreadPool.mpc @@ -1,5 +1,5 @@ //$Id$ -project : csd_framework, tao_output, install, threads { +project(CSD_ThreadPool) : csd_framework, tao_output, install, threads { sharedname = TAO_CSD_ThreadPool dynamicflags = TAO_CSD_TP_BUILD_DLL includes += $(TAO_ROOT)/tao diff --git a/TAO/tao/CodecFactory.mpc b/TAO/tao/CodecFactory.mpc index 7b42e5fea09..78d34cc389b 100644 --- a/TAO/tao/CodecFactory.mpc +++ b/TAO/tao/CodecFactory.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults, nolink_codecfactory { +project(CodecFactory) : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults, nolink_codecfactory { sharedname = TAO_CodecFactory dynamicflags = TAO_CODECFACTORY_BUILD_DLL diff --git a/TAO/tao/Codeset.mpc b/TAO/tao/Codeset.mpc index 458a1590684..f57a6cee265 100644 --- a/TAO/tao/Codeset.mpc +++ b/TAO/tao/Codeset.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, tao_output, install, tao_versioning_idl_defaults, nolink_codecfactory { +project(Codeset) : taolib, tao_output, install, tao_versioning_idl_defaults, nolink_codecfactory { sharedname = TAO_Codeset dynamicflags = TAO_CODESET_BUILD_DLL pch_header = diff --git a/TAO/tao/Compression.mpc b/TAO/tao/Compression.mpc index 5dccc7028c0..329f100827a 100644 --- a/TAO/tao/Compression.mpc +++ b/TAO/tao/Compression.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, tao_versioning_idl_defaults { +project(Compression) : taolib, tao_output, install, tao_versioning_idl_defaults { sharedname = TAO_Compression dynamicflags = TAO_COMPRESSION_BUILD_DLL diff --git a/TAO/tao/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy.mpc index 27d1f70e896..e2922ad8c82 100644 --- a/TAO/tao/DiffServPolicy.mpc +++ b/TAO/tao/DiffServPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(DiffServPolicy) : taolib, tao_output, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { sharedname = TAO_DiffServPolicy dynamicflags = TAO_DIFFSERVPOLICY_BUILD_DLL diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc index 700e4217968..6c344c9afb4 100644 --- a/TAO/tao/DynamicAny.mpc +++ b/TAO/tao/DynamicAny.mpc @@ -1,6 +1,6 @@ //$Id$ -project : install, tao_output, valuetype, tao_versioning_idl_defaults { +project(DynamicAny) : install, tao_output, valuetype, tao_versioning_idl_defaults { sharedname = TAO_DynamicAny dynamicflags = TAO_DYNAMICANY_BUILD_DLL diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc index ce502d748a9..290a1b4ff8a 100644 --- a/TAO/tao/DynamicInterface.mpc +++ b/TAO/tao/DynamicInterface.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, messaging, core_minimum_corba { +project(DynamicInterface) : taolib, tao_output, install, messaging, core_minimum_corba { sharedname = TAO_DynamicInterface dynamicflags = TAO_DYNAMICINTERFACE_BUILD_DLL diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc index 59c0494ed97..d5ef7438812 100644 --- a/TAO/tao/EndpointPolicy.mpc +++ b/TAO/tao/EndpointPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(EndpointPolicy) : taolib, tao_output, install, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { sharedname = TAO_EndpointPolicy dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc index ef637d87d3f..876c157ebaf 100644 --- a/TAO/tao/IFR_Client.mpc +++ b/TAO/tao/IFR_Client.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { +project(IFR_Client) : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_IFR_Client dynamicflags = TAO_IFR_CLIENT_BUILD_DLL diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc index f6ce074aa01..016b30f6e7c 100644 --- a/TAO/tao/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, portableserver, objreftemplate, pi, install, tao_versioning_idl_defaults { +project(IORInterceptor) : taolib, tao_output, portableserver, objreftemplate, pi, install, tao_versioning_idl_defaults { sharedname = TAO_IORInterceptor dynamicflags = TAO_IORINTERCEPTOR_BUILD_DLL diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc index a9d0628b0c8..dfa45815fd1 100644 --- a/TAO/tao/IORManipulation.mpc +++ b/TAO/tao/IORManipulation.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { +project(IORManipulation) : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_IORManip dynamicflags = TAO_IORMANIP_BUILD_DLL diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc index c456c99db0a..289319fa00c 100644 --- a/TAO/tao/IORTable.mpc +++ b/TAO/tao/IORTable.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, tao_output, install, tao_versioning_idl_defaults { +project(IORTable) : taolib, tao_output, install, tao_versioning_idl_defaults { sharedname = TAO_IORTable dynamicflags = TAO_IORTABLE_BUILD_DLL diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc index a000f2efafc..41eb3863003 100644 --- a/TAO/tao/ImR_Client.mpc +++ b/TAO/tao/ImR_Client.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, portableserver, tao_versioning_idl_defaults { +project(ImR_Client) : taolib, tao_output, install, portableserver, tao_versioning_idl_defaults { sharedname = TAO_ImR_Client dynamicflags = TAO_IMR_CLIENT_BUILD_DLL diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp index c481cb49907..2afaffcd7dc 100644 --- a/TAO/tao/LocalObject.cpp +++ b/TAO/tao/LocalObject.cpp @@ -90,6 +90,12 @@ CORBA::LocalObject::_non_existent (void) return false; } +char * +CORBA::LocalObject::_repository_id (void) +{ + throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); +} + #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) void CORBA::LocalObject::_create_request (CORBA::Context_ptr, @@ -121,12 +127,6 @@ CORBA::LocalObject::_request (const char *) throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 4, CORBA::COMPLETED_NO); } -char * -CORBA::LocalObject::_repository_id (void) -{ - throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8, CORBA::COMPLETED_NO); -} - CORBA::Object_ptr CORBA::LocalObject::_get_component (void) { diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index 551e35a030d..7da8786f9fb 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -70,6 +70,9 @@ namespace CORBA /// Always returns false. virtual CORBA::Boolean _non_existent (void); + /// Get the repository id. + virtual char * _repository_id (void); + #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) /// Gets info about object from the Interface Repository. virtual CORBA::InterfaceDef_ptr _get_interface (void); @@ -77,9 +80,6 @@ namespace CORBA /// Throws NO_IMPLEMENT. virtual CORBA::Object_ptr _get_component (void); - /// Get the repository id. - virtual char * _repository_id (void); - virtual void _create_request (CORBA::Context_ptr ctx, const char * operation, CORBA::NVList_ptr arg_list, diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc index 5c746bcc979..74dbd488ab1 100644 --- a/TAO/tao/Messaging.mpc +++ b/TAO/tao/Messaging.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, portableserver, pi, valuetype, tao_versioning_idl_defaults { +project(Messaging) : taolib, tao_output, install, portableserver, pi, valuetype, tao_versioning_idl_defaults { sharedname = TAO_Messaging dynamicflags = TAO_MESSAGING_BUILD_DLL diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc index 492237ab5a2..6ad1c80852f 100644 --- a/TAO/tao/ObjRefTemplate.mpc +++ b/TAO/tao/ObjRefTemplate.mpc @@ -1,5 +1,5 @@ //$Id$ -project : valuetype, portableserver, install, tao_output, tao_versioning_idl_defaults { +project(ObjRefTemplate) : valuetype, portableserver, install, tao_output, tao_versioning_idl_defaults { sharedname = TAO_ObjRefTemplate dynamicflags = TAO_ORT_BUILD_DLL diff --git a/TAO/tao/PI.mpc b/TAO/tao/PI.mpc index d686c1cd86a..f59ae6fae53 100644 --- a/TAO/tao/PI.mpc +++ b/TAO/tao/PI.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, codecfactory, install, tao_versioning_idl_defaults { +project(PI) : taolib, tao_output, codecfactory, install, tao_versioning_idl_defaults { sharedname = TAO_PI dynamicflags = TAO_PI_BUILD_DLL idlflags += -SS -Sci -Gp -Gd \ diff --git a/TAO/tao/PI_Server.mpc b/TAO/tao/PI_Server.mpc index 170598750a0..17c42d40494 100644 --- a/TAO/tao/PI_Server.mpc +++ b/TAO/tao/PI_Server.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, pi, portableserver, install, tao_versioning_idl_defaults { +project(PI_Server) : taolib, tao_output, pi, portableserver, install, tao_versioning_idl_defaults { sharedname = TAO_PI_Server dynamicflags = TAO_PI_SERVER_BUILD_DLL diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc index a5d9f0d1563..0f8b99f8421 100644 --- a/TAO/tao/PortableServer.mpc +++ b/TAO/tao/PortableServer.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { +project(PortableServer) : taolib, tao_output, install, core_anytypecode, tao_versioning_idl_defaults { sharedname = TAO_PortableServer dynamicflags = TAO_PORTABLESERVER_BUILD_DLL diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc index 95a933df552..51443902e14 100644 --- a/TAO/tao/RTCORBA.mpc +++ b/TAO/tao/RTCORBA.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, pi, tao_versioning_idl_defaults { +project(RTCORBA) : taolib, tao_output, install, pi, tao_versioning_idl_defaults { sharedname = TAO_RTCORBA dynamicflags = TAO_RTCORBA_BUILD_DLL requires += rt_corba diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc index c843076ebc7..7a651afbd09 100644 --- a/TAO/tao/RTPortableServer.mpc +++ b/TAO/tao/RTPortableServer.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, rtcorba, portableserver, avoids_corba_e_micro { +project(RTPortableServer) : taolib, tao_output, install, rtcorba, portableserver, avoids_corba_e_micro { sharedname = TAO_RTPortableServer dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc index 2eb46a1bb14..841441264cf 100644 --- a/TAO/tao/RTScheduler.mpc +++ b/TAO/tao/RTScheduler.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, rtcorba, pi, pi_server, portableserver, install, corba_messaging, tao_versioning_idl_defaults, avoids_corba_e_micro { +project(RTScheduler) : taolib, tao_output, rtcorba, pi, pi_server, portableserver, install, corba_messaging, tao_versioning_idl_defaults, avoids_corba_e_micro { sharedname = TAO_RTScheduler dynamicflags = TAO_RTSCHEDULER_BUILD_DLL diff --git a/TAO/tao/SmartProxies.mpc b/TAO/tao/SmartProxies.mpc index 839bc01eea9..d5c022af82f 100644 --- a/TAO/tao/SmartProxies.mpc +++ b/TAO/tao/SmartProxies.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, tao_versioning_idl_defaults { +project(SmartProxies) : taolib, tao_output, install, tao_versioning_idl_defaults { sharedname = TAO_SmartProxies dynamicflags = TAO_SMARTPROXIES_BUILD_DLL diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc index 67a9e32bb6d..9202eec2752 100644 --- a/TAO/tao/Strategies.mpc +++ b/TAO/tao/Strategies.mpc @@ -1,6 +1,6 @@ //$Id$ -project : taolib, tao_output, install, pi, core_anytypecode, core_strategies, tao_versioning_idl_defaults { +project(Strategies) : taolib, tao_output, install, pi, core_anytypecode, core_strategies, tao_versioning_idl_defaults { sharedname = TAO_Strategies dynamicflags = TAO_STRATEGIES_BUILD_DLL diff --git a/TAO/tao/TC.mpc b/TAO/tao/TC.mpc index c13bc55aea7..f9f23d631e9 100644 --- a/TAO/tao/TC.mpc +++ b/TAO/tao/TC.mpc @@ -1,6 +1,6 @@ //$Id$ -project(*) : taolib_with_idl, tao_output, tao_versioning_idl_defaults, install, interceptors, pi { +project(TC) : taolib_with_idl, tao_output, tao_versioning_idl_defaults, install, interceptors, pi { requires += transport_current sharedname = TAO_TC diff --git a/TAO/tao/TC_IIOP.mpc b/TAO/tao/TC_IIOP.mpc index e5b38890b14..771a13ee5ac 100644 --- a/TAO/tao/TC_IIOP.mpc +++ b/TAO/tao/TC_IIOP.mpc @@ -1,6 +1,6 @@ //$Id$ -project(*) : taolib_with_idl, tao_output, tao_versioning_idl_defaults, install, tc, interceptors, pi { +project(TC_IIOP) : taolib_with_idl, tao_output, tao_versioning_idl_defaults, install, tc, interceptors, pi { requires += transport_current sharedname = TAO_TC_IIOP diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc index 8c54a8e4b57..00eba1e5fd4 100644 --- a/TAO/tao/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, ifr_client, tao_versioning_idl_defaults { +project(TypeCodeFactory) : taolib, tao_output, install, ifr_client, tao_versioning_idl_defaults { sharedname = TAO_TypeCodeFactory dynamicflags = TAO_TYPECODEFACTORY_BUILD_DLL diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc index 1dd1225136c..c27b5e2a0a7 100644 --- a/TAO/tao/Valuetype.mpc +++ b/TAO/tao/Valuetype.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, core_anytypecode, avoids_corba_e_micro, tao_versioning_idl_defaults, gen_ostream { +project(Valuetype) : taolib, tao_output, install, core_anytypecode, avoids_corba_e_micro, tao_versioning_idl_defaults, gen_ostream { sharedname = TAO_Valuetype dynamicflags = TAO_VALUETYPE_BUILD_DLL diff --git a/TAO/tao/ZlibCompressor.mpc b/TAO/tao/ZlibCompressor.mpc index dda8e12f6e7..53f426d4926 100644 --- a/TAO/tao/ZlibCompressor.mpc +++ b/TAO/tao/ZlibCompressor.mpc @@ -1,5 +1,5 @@ //$Id$ -project : taolib, tao_output, install, compression, tao_versioning_idl_defaults, zlib { +project(ZlibCompressor) : taolib, tao_output, install, compression, tao_versioning_idl_defaults, zlib { requires += zlib sharedname = TAO_ZlibCompressor dynamicflags = TAO_ZLIBCOMPRESSOR_BUILD_DLL |