diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-16 20:07:09 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-08-16 20:07:09 +0000 |
| commit | f247f1180eca5a9df28ab29bce2a43a6cbd43a38 (patch) | |
| tree | c07bc2e4752f03268cd427c0113504122bc76650 /ace/Auto_Ptr.h | |
| parent | 4a2352b809780fc23df80d40cd6991bba8599d09 (diff) | |
| download | ATCD-f247f1180eca5a9df28ab29bce2a43a6cbd43a38.tar.gz | |
Put in an #include <memory> (for auto_ptr) if the standard C++ library is
being used.
Changed the checks for ACE_HAS_STANDARD_CPP_LIBRARY to also check to see
if it is defined to 0 (which means the same as it not being defined).
Diffstat (limited to 'ace/Auto_Ptr.h')
| -rw-r--r-- | ace/Auto_Ptr.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h index fefc955421b..bd56a735353 100644 --- a/ace/Auto_Ptr.h +++ b/ace/Auto_Ptr.h @@ -21,7 +21,8 @@ #include "ace/ACE.h" -#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) +#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \ + (ACE_HAS_STANDARD_CPP_LIBRARY == 0) template <class X> class ACE_Auto_Basic_Ptr @@ -66,6 +67,12 @@ public: X *operator-> () const; }; +#else /* ACE_HAS_STANDARD_CPP_LIBRARY */ +#include <memory> +#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ + (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) +using std::auto_ptr; +#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ template<class X> |