diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2004-10-28 19:49:56 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2004-10-28 19:49:56 +0000 |
| commit | 9b5712a29a0011f6baa32d7ad217bb2312d4dd61 (patch) | |
| tree | 546981a5559cf1d8cceaee92fe4278ce90e3d3e8 /TAO | |
| parent | 2688ba5aa2ffcc4e3208f9b4783b5ec2364e7728 (diff) | |
| download | ATCD-9b5712a29a0011f6baa32d7ad217bb2312d4dd61.tar.gz | |
ChangeLog tag: Thu Oct 28 14:46:55 2004 Phil Mesnier <mesnier_p@ociweb.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8980f3cd491..94c37c8eac6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Oct 28 14:46:55 2004 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp: + * orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp: + Addressed MSVC 6.0 compiler problem with typedef'ed templates + declared within namespaces. + Thu Oct 28 12:01:50 2004 Phil Mesnier <mesnier_p@ociweb.com> * Release (CONTROLLED_FILES): diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp index 3a9de9be08c..d594ab41cb9 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.cpp @@ -27,7 +27,7 @@ ACE_RCSID (HTIOP, TAO::HTIOP::Completion_Handler::Completion_Handler (ACE_Thread_Manager *t) - : TAO::HTIOP::COMPLETION_BASE(t,0,0), + : COMPLETION_BASE(t,0,0), orb_core_ (0), channel_(0), concurrency_strategy_ (0) @@ -42,7 +42,7 @@ TAO::HTIOP::Completion_Handler::Completion_Handler (ACE_Thread_Manager *t) TAO::HTIOP::Completion_Handler::Completion_Handler (TAO_ORB_Core *orb_core, CORBA::Boolean ) - : TAO::HTIOP::COMPLETION_BASE(orb_core->thr_mgr(),0,0), + : COMPLETION_BASE(orb_core->thr_mgr(),0,0), orb_core_ (orb_core), channel_(0), concurrency_strategy_ (0) diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index ff00278b9bc..c2ea31312ec 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -31,7 +31,7 @@ ACE_RCSID (HTIOP, "$Id$") TAO::HTIOP::Connection_Handler::Connection_Handler (ACE_Thread_Manager *t) - : TAO::HTIOP::SVC_HANDLER (t,0,0), + : SVC_HANDLER (t,0,0), TAO_Connection_Handler (0) { // This constructor should *never* get called, it is just here to @@ -44,7 +44,7 @@ TAO::HTIOP::Connection_Handler::Connection_Handler (ACE_Thread_Manager *t) TAO::HTIOP::Connection_Handler::Connection_Handler (TAO_ORB_Core *orb_core, CORBA::Boolean flag) - : TAO::HTIOP::SVC_HANDLER (orb_core->thr_mgr (), 0, 0), + : SVC_HANDLER (orb_core->thr_mgr (), 0, 0), TAO_Connection_Handler (orb_core) { TAO::HTIOP::Transport* specific_transport = 0; |