Imported Upstream version 1.58.0upstream/1.58.0

Change-Id: If0072143aa26874812e0db6872e1efb10a3e5e94
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/boost/interprocess/sync/xsi/xsi_named_mutex.hpp b/boost/interprocess/sync/xsi/xsi_named_mutex.hpp
index 1c4ee78a4f..7d8cf50a83 100644
--- a/boost/interprocess/sync/xsi/xsi_named_mutex.hpp
+++ b/boost/interprocess/sync/xsi/xsi_named_mutex.hpp
@@ -11,7 +11,11 @@
 #ifndef BOOST_INTERPROCESS_XSI_XSI_NAMED_MUTEX_HPP
 #define BOOST_INTERPROCESS_XSI_XSI_NAMED_MUTEX_HPP
 
-#if defined(_MSC_VER)
+#ifndef BOOST_CONFIG_HPP
+#  include <boost/config.hpp>
+#endif
+#
+#if defined(BOOST_HAS_PRAGMA_ONCE)
 #  pragma once
 #endif
 
@@ -30,11 +34,13 @@
 #include <boost/interprocess/interprocess_fwd.hpp>
 #include <boost/interprocess/exceptions.hpp>
 #include <boost/interprocess/sync/xsi/basic_xsi_semaphore.hpp>
+#include <boost/interprocess/detail/simple_swap.hpp>
+
 #include <cstddef>
 #include <boost/assert.hpp>
 #include <boost/cstdint.hpp>
 #include <string>
-#include <boost/assert.hpp>
+
 
 //!\file
 //!Describes a class representing a xsi-based named_mutex.
@@ -142,10 +148,10 @@ inline const char *xsi_named_mutex::get_path() const
 
 inline void xsi_named_mutex::swap(xsi_named_mutex &other)
 {
-   std::swap(m_key,   other.m_key);
-   std::swap(m_id,    other.m_id);
-   std::swap(m_semid, other.m_semid);
-   std::swap(m_perm,  other.m_perm);
+   (simple_swap)(m_key,   other.m_key);
+   (simple_swap)(m_id,    other.m_id);
+   (simple_swap)(m_semid, other.m_semid);
+   (simple_swap)(m_perm,  other.m_perm);
    m_path.swap(other.m_path);
 }