diff options
author | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-12 17:59:36 +0000 |
---|---|---|
committer | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-12 17:59:36 +0000 |
commit | b74f4e0f4354fee69a775188bda9a528bc3e894b (patch) | |
tree | f9e3ffad3be16312a664c6f146586961dd7db798 | |
parent | 7c8a4331934a7d497142c6c673ba1038886b152e (diff) | |
download | ATCD-b74f4e0f4354fee69a775188bda9a528bc3e894b.tar.gz |
Fri Apr 12 17:58:35 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>
-rw-r--r-- | TAO/ChangeLog | 7 | ||||
-rw-r--r-- | TAO/tao/LF_Strategy_Complete.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/TAO_Singleton.cpp | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 551ed1dbe40..d0f3ec31324 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Apr 12 17:58:35 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * tao/LF_Strategy_Complete.cpp: + * tao/TAO_Singleton.cpp: + + Fix undeclared TAOLIB_DEBUG problem. + Fri Apr 12 17:27:29 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/ImplRepo_Service/Adapter_Activator.h: diff --git a/TAO/tao/LF_Strategy_Complete.cpp b/TAO/tao/LF_Strategy_Complete.cpp index 023c6f1085f..67472a49429 100644 --- a/TAO/tao/LF_Strategy_Complete.cpp +++ b/TAO/tao/LF_Strategy_Complete.cpp @@ -4,7 +4,7 @@ #include "tao/LF_Follower.h" #include "tao/Leader_Follower.h" #include "ace/Guard_T.h" -#include "ace/Log_Msg.h" +#include "tao/debug.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/TAO_Singleton.cpp b/TAO/tao/TAO_Singleton.cpp index 6c4f91c1081..3698696ddab 100644 --- a/TAO/tao/TAO_Singleton.cpp +++ b/TAO/tao/TAO_Singleton.cpp @@ -15,7 +15,7 @@ #include "ace/Guard_T.h" #include "ace/Object_Manager.h" -#include "ace/Log_Msg.h" +#include "tao/debug.h" #include "ace/os_include/os_typeinfo.h" #if !defined (__ACE_INLINE__) |