boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-03 22:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use newly refactored move/detail/std_fwd_xxx.hpp headers

Browse Source
This commit is contained in:
Ion Gaztañaga
2015-09-14 22:38:26 +02:00
parent 4d7c809ccc
commit f637fada71
2 changed files with 10 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/boost/container/detail/std_fwd.hpp
View File

@@ -23,26 +23,8 @@
// Standard predeclarations // Standard predeclarations
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#if defined(_LIBCPP_VERSION) #include <boost/move/detail/std_ns_begin.hpp>
#define BOOST_CONTAINER_CLANG_INLINE_STD_NS BOOST_MOVE_STD_NS_BEG
#pragma GCC diagnostic push
#if defined(__clang__)
#pragma GCC diagnostic ignored "-Wc++11-extensions"
#endif
#define BOOST_CONTAINER_STD_NS_BEG _LIBCPP_BEGIN_NAMESPACE_STD
#define BOOST_CONTAINER_STD_NS_END _LIBCPP_END_NAMESPACE_STD
#elif defined(BOOST_GNU_STDLIB) && defined(_GLIBCXX_BEGIN_NAMESPACE_VERSION) //GCC >= 4.6
#define BOOST_CONTAINER_STD_NS_BEG namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION
#define BOOST_CONTAINER_STD_NS_END _GLIBCXX_END_NAMESPACE_VERSION } // namespace
#elif defined(BOOST_GNU_STDLIB) && defined(_GLIBCXX_BEGIN_NAMESPACE) //GCC >= 4.2
#define BOOST_CONTAINER_STD_NS_BEG _GLIBCXX_BEGIN_NAMESPACE(std)
#define BOOST_CONTAINER_STD_NS_END _GLIBCXX_END_NAMESPACE
#else
#define BOOST_CONTAINER_STD_NS_BEG namespace std{
#define BOOST_CONTAINER_STD_NS_END }
#endif
BOOST_CONTAINER_STD_NS_BEG
template<class T> template<class T>
class allocator; class allocator;
@@ -68,11 +50,7 @@ struct allocator_arg_t;
struct piecewise_construct_t; struct piecewise_construct_t;
BOOST_CONTAINER_STD_NS_END BOOST_MOVE_STD_NS_END
#include <boost/move/detail/std_ns_end.hpp>
#ifdef BOOST_CONTAINER_CLANG_INLINE_STD_NS
#pragma GCC diagnostic pop
#undef BOOST_CONTAINER_CLANG_INLINE_STD_NS
#endif //BOOST_CONTAINER_CLANG_INLINE_STD_NS
#endif //#ifndef BOOST_CONTAINER_DETAIL_STD_FWD_HPP #endif //#ifndef BOOST_CONTAINER_DETAIL_STD_FWD_HPP

25
include/boost/container/slist.hpp
View File

@@ -1652,22 +1652,15 @@ struct has_trivial_destructor_after_move<boost::container::slist<T, Allocator> >
namespace container { namespace container {
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
}} //namespace boost{ namespace container { }} //namespace boost{ namespace container {
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
// Specialization of insert_iterator so that insertions will be constant // Specialization of insert_iterator so that insertions will be constant
// time rather than linear time. // time rather than linear time.
#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED #include <boost/move/detail/std_ns_begin.hpp>
BOOST_CONTAINER_DOC1ST(namespace std {, BOOST_MOVE_STD_NS_BEG)
#if defined(__clang__) && defined(_LIBCPP_VERSION)
#define BOOST_CONTAINER_CLANG_INLINE_STD_NS
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wc++11-extensions"
#endif
BOOST_CONTAINER_STD_NS_BEG
template <class T, class Allocator> template <class T, class Allocator>
class insert_iterator<boost::container::slist<T, Allocator> > class insert_iterator<boost::container::slist<T, Allocator> >
@@ -1700,14 +1693,8 @@ class insert_iterator<boost::container::slist<T, Allocator> >
insert_iterator<Container>& operator++(int){ return *this; } insert_iterator<Container>& operator++(int){ return *this; }
}; };
BOOST_CONTAINER_STD_NS_END BOOST_CONTAINER_DOC1ST( }, BOOST_MOVE_STD_NS_END)
#include <boost/move/detail/std_ns_end.hpp>
#ifdef BOOST_CONTAINER_CLANG_INLINE_STD_NS
#pragma GCC diagnostic pop
#undef BOOST_CONTAINER_CLANG_INLINE_STD_NS
#endif //BOOST_CONTAINER_CLANG_INLINE_STD_NS
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
#include <boost/container/detail/config_end.hpp> #include <boost/container/detail/config_end.hpp>