import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / proto / proto_fwd.hpp

diff --git a/ceph/src/boost/boost/proto/proto_fwd.hpp b/ceph/src/boost/boost/proto/proto_fwd.hpp
index a1a25987f136c78b9f79d49d14479b083126efc3..56ae75178ff90858ed35ce640e729d85591f7ab7 100644 (file)
--- a/ceph/src/boost/boost/proto/proto_fwd.hpp
+++ b/ceph/src/boost/boost/proto/proto_fwd.hpp
@@ -124,9 +124,11 @@
 #endif
 
 #if defined(_MSC_VER)
+# define BOOST_PROTO_DISABLE_MSVC_C4180 __pragma(warning(disable : 4180))  // qualifier applied to function type has no meaning; ignored
 # define BOOST_PROTO_DISABLE_MSVC_C4522 __pragma(warning(disable : 4522))  // 'class' : multiple assignment operators specified
 # define BOOST_PROTO_DISABLE_MSVC_C4714 __pragma(warning(disable : 4714))  // function 'xxx' marked as __forceinline not inlined
 #else
+# define BOOST_PROTO_DISABLE_MSVC_C4180
 # define BOOST_PROTO_DISABLE_MSVC_C4522 
 # define BOOST_PROTO_DISABLE_MSVC_C4714
 #endif
@@ -683,7 +685,7 @@ namespace boost { namespace proto
     typedef functional::make_pair   _make_pair;
     typedef functional::first       _first;
     typedef functional::second      _second;
-    typedef functional::pop_front   _at;
+    typedef functional::at          _at;
     typedef functional::pop_front   _pop_front;
     typedef functional::push_front  _push_front;
     typedef functional::pop_back    _pop_back;