summaryrefslogtreecommitdiff
path: root/ace/Swap.inl
diff options
context:
space:
mode:
authorjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-26 19:54:08 +0000
committerjohn_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-26 19:54:08 +0000
commit664244e804da11536f2712a61116204e8042f312 (patch)
treec058324f9e24262a32f3e594054016c3f02046c5 /ace/Swap.inl
parentd9d5d3d83831c9728147bfe5a2b53822d7ffca21 (diff)
downloadATCD-664244e804da11536f2712a61116204e8042f312.tar.gz
Fixed merge related compile errors
Diffstat (limited to 'ace/Swap.inl')
-rw-r--r--ace/Swap.inl6
1 files changed, 6 insertions, 0 deletions
diff --git a/ace/Swap.inl b/ace/Swap.inl
index b1139ca3ffb..195f1559f69 100644
--- a/ace/Swap.inl
+++ b/ace/Swap.inl
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
/**
* @file Swap.inl
*
@@ -6,6 +8,8 @@
* @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)
{
@@ -13,3 +17,5 @@ ACE_Swap<T>::swap (T &lhs, T& rhs)
lhs = rhs;
rhs = tmp;
}
+
+ACE_END_VERSIONED_NAMESPACE_DECL