diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-03-21 15:45:20 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-03-21 15:46:37 +0900 |
| commit | 733b5d5ae2c5d625211e2985ac25728ac3f54883 (patch) | |
| tree | a5b214744b256f07e1dc2bd7273035a7808c659f /boost/interprocess/sync/xsi | |
| parent | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (diff) | |
| download | boost-upstream/1.58.0.tar.gz boost-upstream/1.58.0.tar.bz2 boost-upstream/1.58.0.zip | |
Imported Upstream version 1.58.0upstream/1.58.0
Change-Id: If0072143aa26874812e0db6872e1efb10a3e5e94
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/interprocess/sync/xsi')
| -rw-r--r-- | boost/interprocess/sync/xsi/advanced_xsi_semaphore.hpp | 6 | ||||
| -rw-r--r-- | boost/interprocess/sync/xsi/simple_xsi_semaphore.hpp | 6 | ||||
| -rw-r--r-- | boost/interprocess/sync/xsi/xsi_named_mutex.hpp | 18 |
3 files changed, 22 insertions, 8 deletions
diff --git a/boost/interprocess/sync/xsi/advanced_xsi_semaphore.hpp b/boost/interprocess/sync/xsi/advanced_xsi_semaphore.hpp index b69cfbf934..49562f5cbd 100644 --- a/boost/interprocess/sync/xsi/advanced_xsi_semaphore.hpp +++ b/boost/interprocess/sync/xsi/advanced_xsi_semaphore.hpp @@ -30,7 +30,11 @@ #ifndef BOOST_INTERPROCESS_SYNC_XSI_ADVANCED_XSI_SEMAPHORE_HPP #define BOOST_INTERPROCESS_SYNC_XSI_ADVANCED_XSI_SEMAPHORE_HPP -#if defined(_MSC_VER) +#ifndef BOOST_CONFIG_HPP +# include <boost/config.hpp> +#endif +# +#if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif diff --git a/boost/interprocess/sync/xsi/simple_xsi_semaphore.hpp b/boost/interprocess/sync/xsi/simple_xsi_semaphore.hpp index 69ad34caf2..3d6fd882c6 100644 --- a/boost/interprocess/sync/xsi/simple_xsi_semaphore.hpp +++ b/boost/interprocess/sync/xsi/simple_xsi_semaphore.hpp @@ -10,7 +10,11 @@ #ifndef BOOST_INTERPROCESS_SYNC_XSI_SIMPLE_XSI_SEMAPHORE_HPP #define BOOST_INTERPROCESS_SYNC_XSI_SIMPLE_XSI_SEMAPHORE_HPP -#if defined(_MSC_VER) +#ifndef BOOST_CONFIG_HPP +# include <boost/config.hpp> +#endif +# +#if defined(BOOST_HAS_PRAGMA_ONCE) # pragma once #endif 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); } |