diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-12 17:29:18 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-12 17:29:18 +0000 |
| commit | 274a553019720f689c2e146ed6ecd3f546c39b95 (patch) | |
| tree | 31fac45b8bcc2ace6d730848477a4f086abaee90 | |
| parent | ee9a3e9dc5e146f2d6ce3801484aebf16592024c (diff) | |
| download | ATCD-274a553019720f689c2e146ed6ecd3f546c39b95.tar.gz | |
Fri Apr 12 17:27:29 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Forwarder.h | 2 | ||||
| -rw-r--r-- | TAO/utils/logWalker/Invocation.cpp | 5 |
4 files changed, 15 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 998cc66ab6a..551ed1dbe40 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Fri Apr 12 17:27:29 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/Adapter_Activator.h: + * orbsvcs/ImplRepo_Service/Forwarder.h: + + Fix for versioned namespace builds. + + * utils/logWalker/Invocation.cpp: + + clean up some scoreboard warnings. + Fri Apr 12 12:11:11 UTC 2013 Martin Corino <mcorino@remedy.nl> * tests/Bug_3384_Regression/Client_i.h: diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h index 8a56836c0f1..988b6c97098 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h @@ -23,8 +23,9 @@ #include "tao/LocalObject.h" +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ServantBase; - +TAO_END_VERSIONED_NAMESPACE_DECL /** * @class ImR_Adapter_Activator diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h index cc5b91aa674..927fec2103e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h +++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h @@ -42,9 +42,11 @@ class ImR_Locator_i; */ // forward declare the types used to manage AMH/DSI coupling +TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_AMH_DSI_Response_Handler; typedef TAO_AMH_DSI_Response_Handler * TAO_AMH_DSI_Response_Handler_ptr; class TAO_AMH_DSI_Response_Handler_var; +TAO_END_VERSIONED_NAMESPACE_DECL class ImR_DSI_ResponseHandler : public ImR_ResponseHandler { diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index 25bd4d1da29..5364d2c1914 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -295,15 +295,10 @@ Invocation::dump_finish_line (ostream &strm, size_t indent) strm << setw(7) << this->repl_octets_->log_posn() << " " << setw(0); const char *opname = ""; - const char *dir_2 = " in "; if (this->req_octets_ != 0) { opname = this->req_octets_->operation(); - if (this->req_octets_->sending()) - { - dir_2 = " from "; - } } if (opname == 0 || opname[0] == 0) |