diff options
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/ace/Makefile.am | 2 | ||||
| -rw-r--r-- | ACE/ace/Swap.cpp | 22 | ||||
| -rw-r--r-- | ACE/ace/Swap.h | 54 | ||||
| -rw-r--r-- | ACE/ace/Swap.inl | 21 | ||||
| -rw-r--r-- | ACE/ace/ace.mpc | 2 | ||||
| -rw-r--r-- | ACE/ace/ace_for_tao.mpc | 2 |
7 files changed, 10 insertions, 103 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 508e76ffda8..02041681d58 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Wed Feb 21 08:35:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Swap.{h,cpp,inl}: + Removed, use std::swap instead of ACE_Swap + + * ace/ace.mpc: + * ace/ace_for_tao.mpc: + * ace/Makefile.am: + Removed Swap.{h,cpp,inl} + Wed Feb 21 08:13:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp: diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index ab46b3e2877..7846a88d612 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -969,8 +969,6 @@ nobase_include_HEADERS += \ Svc_Conf_Tokens.h \ Svc_Handler.cpp \ Svc_Handler.h \ - Swap.h \ - Swap.inl \ Synch.h \ Synch_Options.h \ Synch_T.cpp \ diff --git a/ACE/ace/Swap.cpp b/ACE/ace/Swap.cpp deleted file mode 100644 index eb14789c3de..00000000000 --- a/ACE/ace/Swap.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @file Swap.cpp - * - * $Id$ - * - * @author Carlos O'Ryan <coryan@uci.edu> - */ - -#ifndef ACE_SWAP_CPP -#define ACE_SWAP_CPP - -#include "ace/Swap.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#if !defined (__ACE_INLINE__) -#include "ace/Swap.inl" -#endif /* __ACE_INLINE__ */ - -#endif /* ACE_SWAP_CPP */ diff --git a/ACE/ace/Swap.h b/ACE/ace/Swap.h deleted file mode 100644 index 89bf26a80d9..00000000000 --- a/ACE/ace/Swap.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- - -/** - * @file Swap.h - * - * $Id$ - * - * @author Carlos O'Ryan <coryan@uci.edu> - */ - -#ifndef ACE_SWAP_H -#define ACE_SWAP_H -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class ACE_Swap - * - * @brief Defines a function to swap two variables. - * - * @deprecated This template is deprecated, you can use std::swap without - * problems on all platforms. - * - */ -template<class T> class ACE_Swap -{ -public: - /// Swap two variables - static void swap (T &lhs, T &rhs); -}; - -ACE_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -#include "ace/Swap.inl" -#endif /* __ACE_INLINE__ */ - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Swap.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Swap.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" -#endif /* ACE_FUNCTOR_H */ diff --git a/ACE/ace/Swap.inl b/ACE/ace/Swap.inl deleted file mode 100644 index 195f1559f69..00000000000 --- a/ACE/ace/Swap.inl +++ /dev/null @@ -1,21 +0,0 @@ -// -*- C++ -*- - -/** - * @file Swap.inl - * - * $Id$ - * - * @author Carlos O'Ryan <coryan@uci.edu> - */ - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -template<class T> ACE_INLINE void -ACE_Swap<T>::swap (T &lhs, T& rhs) -{ - T tmp = lhs; - lhs = rhs; - rhs = tmp; -} - -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 0fc52bf9afe..6f67e730e44 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -363,7 +363,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca Lock_Adapter_T.inl Refcounted_Auto_Ptr.inl Reverse_Lock_T.inl - Swap.inl TSS_T.inl ace_wchar.inl OS.inl @@ -415,7 +414,6 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca String_Base_Const.h Svc_Conf.h Svc_Conf_Tokens.h - Swap.h Synch.h Synch_Traits.h TSS_T.h diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 58b7a928fe5..85798f0692f 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -283,7 +283,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, OS_String.inl Refcounted_Auto_Ptr.inl Reverse_Lock_T.inl - Swap.inl TSS_T.inl ace_wchar.inl MMAP_Memory_Pool.inl @@ -334,7 +333,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, String_Base_Const.h Svc_Conf.h Svc_Conf_Tokens.h - Swap.h Synch.h Synch_Traits.h TSS_T.h |