diff options
Diffstat (limited to 'TAO/tao/diffs/MessagingC.h.diff')
| -rw-r--r-- | TAO/tao/diffs/MessagingC.h.diff | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/TAO/tao/diffs/MessagingC.h.diff b/TAO/tao/diffs/MessagingC.h.diff index c22f5e97ca9..d6d8e16f6a7 100644 --- a/TAO/tao/diffs/MessagingC.h.diff +++ b/TAO/tao/diffs/MessagingC.h.diff @@ -1621,7 +1621,7 @@ public: - + - friend class ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>; + friend class ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>; - + int register_proxy_factory ( @@ -1653,12 +1653,12 @@ @@ -2502,11 +2569,11 @@ TAO_Messaging_ReplyHandler_Default_Proxy_Factory *proxy_factory_; int delete_proxy_factory_; - ACE_SYNCH_RECURSIVE_MUTEX lock_; + TAO_SYNCH_RECURSIVE_MUTEX lock_; - + }; - typedef ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER; + typedef ACE_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX> TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER; - + class TAO_Export TAO_Messaging_ReplyHandler_Smart_Proxy_Base |