projects
/
platform
/
upstream
/
boost.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.57.0
[platform/upstream/boost.git]
/
boost
/
interprocess
/
smart_ptr
/
enable_shared_from_this.hpp
diff --git
a/boost/interprocess/smart_ptr/enable_shared_from_this.hpp
b/boost/interprocess/smart_ptr/enable_shared_from_this.hpp
index
9c8c791
..
0ca3b0a
100644
(file)
--- a/
boost/interprocess/smart_ptr/enable_shared_from_this.hpp
+++ b/
boost/interprocess/smart_ptr/enable_shared_from_this.hpp
@@
-3,7
+3,7
@@
// This file is the adaptation for Interprocess of boost/enable_shared_from_this.hpp
//
// (C) Copyright Peter Dimov 2002
// This file is the adaptation for Interprocess of boost/enable_shared_from_this.hpp
//
// (C) Copyright Peter Dimov 2002
-// (C) Copyright Ion Gaztanaga 2006. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2006
-2012
. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@
-14,6
+14,10
@@
#ifndef BOOST_INTERPROCESS_ENABLE_SHARED_FROM_THIS_HPP_INCLUDED
#define BOOST_INTERPROCESS_ENABLE_SHARED_FROM_THIS_HPP_INCLUDED
#ifndef BOOST_INTERPROCESS_ENABLE_SHARED_FROM_THIS_HPP_INCLUDED
#define BOOST_INTERPROCESS_ENABLE_SHARED_FROM_THIS_HPP_INCLUDED
+#if defined(_MSC_VER)
+# pragma once
+#endif
+
#include <boost/interprocess/detail/config_begin.hpp>
#include <boost/interprocess/detail/workaround.hpp>
#include <boost/interprocess/detail/config_begin.hpp>
#include <boost/interprocess/detail/workaround.hpp>
@@
-34,7
+38,7
@@
namespace interprocess{
template<class T, class A, class D>
class enable_shared_from_this
{
template<class T, class A, class D>
class enable_shared_from_this
{
- /// @cond
+ #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
protected:
enable_shared_from_this()
{}
protected:
enable_shared_from_this()
{}
@@
-47,7
+51,7
@@
class enable_shared_from_this
~enable_shared_from_this()
{}
~enable_shared_from_this()
{}
- /// @endcond
+ #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
public:
shared_ptr<T, A, D> shared_from_this()
public:
shared_ptr<T, A, D> shared_from_this()
@@
-64,10
+68,10
@@
class enable_shared_from_this
return p;
}
return p;
}
- /// @cond
+ #if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
typedef T element_type;
mutable weak_ptr<element_type, A, D> _internal_weak_this;
typedef T element_type;
mutable weak_ptr<element_type, A, D> _internal_weak_this;
- /// @endcond
+ #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED
};
} // namespace interprocess
};
} // namespace interprocess