diff options
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1765663cb07..5a434d22831 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 20 07:47:10 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/IIOP_Connector.cpp: + Put TList_Holder in a named namespace to resolve some + invalid Intel C++ warnings + Thu Feb 20 01:51:00 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 05ab0e5d7a5..b532e9ef52d 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -393,7 +393,7 @@ TAO_IIOP_Connector::begin_connection (TAO_IIOP_Connection_Handler *&svc_handler, return result; } -namespace +namespace TAO_IIOP { /// RAII holder for a TAO_Transport list class TList_Holder @@ -435,7 +435,7 @@ TAO_IIOP_Connector::complete_connection (int result, TAO_LF_Multi_Event *mev, ACE_Time_Value *timeout) { - TList_Holder tlist(count); + TAO_IIOP::TList_Holder tlist(count); TAO_Transport *transport = 0; |