From 664244e804da11536f2712a61116204e8042f312 Mon Sep 17 00:00:00 2001
From: john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Wed, 26 Apr 2006 19:54:08 +0000
Subject: Fixed merge related compile errors

---
 ace/Swap.inl | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ace/Swap.inl')

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
-- 
cgit v1.2.1