diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-03 12:08:22 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-03 12:08:22 +0000 |
| commit | 222e0ebd9af41425dd9a7ad7aa2a5a911733a3e7 (patch) | |
| tree | cd4f13b3f65d5201c350c0eec4e0a690b1799be9 | |
| parent | 0862b96ccec604665a6985ce9e0c79393978548b (diff) | |
| download | ATCD-222e0ebd9af41425dd9a7ad7aa2a5a911733a3e7.tar.gz | |
Tue Aug 3 12:07:11 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/taodefaults.mpb:
Removed exceptions as base, we are removing non exception support
* tao/Acceptor_Registry.cpp:
Removed not needed include
* tao/CORBALOC_Parser.h:
Updated include base ace/Array.h will be removed soon
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/MPC/config/taodefaults.mpb | 2 | ||||
| -rw-r--r-- | TAO/tao/Acceptor_Registry.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/CORBALOC_Parser.h | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4abc3f13e3a..c5cab7d5304 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Aug 3 12:07:11 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/taodefaults.mpb: + Removed exceptions as base, we are removing non exception support + + * tao/Acceptor_Registry.cpp: + Removed not needed include + + * tao/CORBALOC_Parser.h: + Updated include base ace/Array.h will be removed soon + Sun Aug 1 18:16:59 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/TAO/MPC/config/taodefaults.mpb b/TAO/MPC/config/taodefaults.mpb index 8e9f1886884..7efd727884e 100644 --- a/TAO/MPC/config/taodefaults.mpb +++ b/TAO/MPC/config/taodefaults.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : exceptions, tao_vc8warnings { +project : tao_vc8warnings { staticflags += TAO_AS_STATIC_LIBS includes += $(TAO_ROOT) libpaths += $(ACE_ROOT)/lib diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 366f1523b98..1e1b85c8be3 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -19,7 +19,6 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_ctype.h" -#include "ace/CORBA_macros.h" #if !defined(__ACE_INLINE__) #include "tao/Acceptor_Registry.inl" diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index 5bebf98e3ec..5ecaa60439e 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -25,7 +25,7 @@ #if (TAO_HAS_CORBALOC_PARSER == 1) #include "ace/Service_Config.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "tao/Profile.h" #include "ace/SString.h" |