diff options
| author | Mathias Stearn <mathias@10gen.com> | 2017-02-22 18:27:24 -0500 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2017-02-28 11:58:12 -0500 |
| commit | 87835611622ec35171506f254bfb24a560c8b741 (patch) | |
| tree | a834eecad42068556c50115da7523ee205cbebf9 /src/third_party | |
| parent | 2128f3a19f31ad31d97cb1ffec9a9320d641ff7c (diff) | |
| download | mongo-87835611622ec35171506f254bfb24a560c8b741.tar.gz | |
SERVER-27956 fix gcc6 compile warning
This is a more minimal version of
https://github.com/boostorg/function/commit/bde64bf9ebe7a05e7c56505ea33133bde0ccbad0
and
https://github.com/boostorg/function/commit/54988e8e91ac0272f9364ae1818f519621b18317
that will tide us over until we can upgrade to a newer version of boost.
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/boost-1.60.0/boost/function/function_base.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/third_party/boost-1.60.0/boost/function/function_base.hpp b/src/third_party/boost-1.60.0/boost/function/function_base.hpp index 35c1995ecee..f985fef0356 100644 --- a/src/third_party/boost-1.60.0/boost/function/function_base.hpp +++ b/src/third_party/boost-1.60.0/boost/function/function_base.hpp @@ -121,7 +121,9 @@ namespace boost { } obj_ref; // To relax aliasing constraints - mutable char data; + mutable char data[sizeof(bound_memfunc_ptr_t)]; + static_assert(sizeof(bound_memfunc_ptr_t) >= sizeof(obj_ref_t), + "sizeof(bound_memfunc_ptr_t) >= sizeof(obj_ref_t)"); }; /** |