diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-23 17:13:54 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-23 17:13:54 +0000 |
| commit | c8e812f017a1c6926e1de84d1332c6c6ea1e79ef (patch) | |
| tree | eac6f3b26d882072ea4aef67acb037f33b2afc0b | |
| parent | 2cdd04d50f722a00415e95a4530d142205b53721 (diff) | |
| download | ATCD-c8e812f017a1c6926e1de84d1332c6c6ea1e79ef.tar.gz | |
Tue Apr 23 17:13:04 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index df18b53b216..488d1a27857 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 23 17:13:04 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h: + * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: + + Scoreboard cleanup for QNX and corba_e builds. + Tue Apr 23 16:12:25 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/tests/ImplRepo/RestartServer/MessengerServer.cpp: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h index c9c0fe7b9ff..eb7c28f6492 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_ResponseHandler.h @@ -11,13 +11,12 @@ #ifndef IMR_RESPONSE_HANDLER_H #define IMR_RESPONSE_HANDLER_H +#include "tao/LocalObject.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/LocalObject.h" - //---------------------------------------------------------------------------- /** diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc index 5abf6223e9c..cbb585df5b2 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc @@ -56,7 +56,7 @@ project(ImR_Activator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, dy } } -project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, tao_versioning_idl_defaults { +project(ImR_Locator_IDL) : orbsvcslib, orbsvcs_output, conv_lib, valuetype, portableserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro,tao_versioning_idl_defaults { sharedname = TAO_ImR_Locator_IDL after += ImR_Activator_IDL libs += TAO_ImR_Activator_IDL TAO_Async_ImR_Client_IDL |