diff options
| author | Adam Mitz <mitza@ociweb.com> | 2016-06-17 14:09:28 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2016-06-17 14:09:28 -0500 |
| commit | 85c486146bc456ab33887f2157aca52a61dec9ff (patch) | |
| tree | ee883250cfaa90a31e76d1d6e339f3916f55aa01 | |
| parent | 7767d0dd86da1d81ebe619f02e5716cac1ea4987 (diff) | |
| download | ATCD-85c486146bc456ab33887f2157aca52a61dec9ff.tar.gz | |
Updates to work with previous commit
| -rw-r--r-- | TAO/examples/Simple/grid/Grid_i.cpp | 1 | ||||
| -rw-r--r-- | TAO/examples/Simple/grid/Grid_i.h | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynAnyUtils_T.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h | 1 | ||||
| -rw-r--r-- | TAO/tests/Oneway_Send_Timeouts/Client.cpp | 1 | ||||
| -rw-r--r-- | TAO/tests/Storable/Savable.cpp | 2 |
7 files changed, 9 insertions, 2 deletions
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index df8733c3027..7dc8050e1aa 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -1,6 +1,5 @@ // -*- C++ -*- #include "Grid_i.h" -#include "ace/Auto_Ptr.h" // Solaris and some Windows compilers don't have min in std namespaces // moreover on Windows 'min' is a macro, so we have to avoid using it literally. diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h index 5386a640d70..b5ca51d374e 100644 --- a/TAO/examples/Simple/grid/Grid_i.h +++ b/TAO/examples/Simple/grid/Grid_i.h @@ -13,7 +13,8 @@ #define GRID_I_H #include "GridS.h" -#include <ace/Vector_T.h> +#include "ace/Vector_T.h" +#include "ace/Auto_Ptr.h" /** * @class Grid_i: diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp index 15a23d002cf..98172797c7b 100644 --- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp @@ -4,6 +4,7 @@ #include "orbsvcs/CosEventChannelAdminC.h" #include "orbsvcs/CosNamingC.h" +#include "ace/Auto_Ptr.h" #include "ace/Task.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_strings.h" diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp index 797851a1e5c..7e96685a962 100644 --- a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp +++ b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp @@ -26,6 +26,8 @@ #include "tao/DynamicAny/DynAnyFactory.h" +#include "ace/Auto_Ptr.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h index 7bb3eb4318a..bb952ea1fca 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h @@ -19,6 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Auto_Ptr.h" #include "ace/Task.h" #include "ace/ARGV.h" #include "ace/String_Base.h" diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp index f80506b0c0d..cfb0e0875cf 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp @@ -1,6 +1,7 @@ #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/Auto_Ptr.h" #include "ace/Get_Opt.h" #include "ace/Time_Value.h" #include "ace/OS_NS_unistd.h" diff --git a/TAO/tests/Storable/Savable.cpp b/TAO/tests/Storable/Savable.cpp index 45fd111d431..11aad54585a 100644 --- a/TAO/tests/Storable/Savable.cpp +++ b/TAO/tests/Storable/Savable.cpp @@ -3,6 +3,8 @@ #include "tao/Storable_Factory.h" #include "tao/Storable_File_Guard.h" +#include "ace/Auto_Ptr.h" + const int Savable::bytes_size_max = 128; class Savable_File_Guard: public TAO::Storable_File_Guard |