From 0ecda9378719c2f2e8cf1a4417a4413bf5dc6ac9 Mon Sep 17 00:00:00 2001 From: Adam Wulkiewicz Date: Wed, 17 Feb 2016 05:24:32 +0100 Subject: [PATCH] [test][util][range] Fix compilation errors on some platforms. --- test/util/range.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/util/range.cpp b/test/util/range.cpp index d0c717fde..f48789a9b 100644 --- a/test/util/range.cpp +++ b/test/util/range.cpp @@ -65,7 +65,7 @@ struct NonMovable NonMovable(int ii = 0) : i(ii) {} NonMovable(NonMovable const& ii) : i(ii.i) {} NonMovable & operator=(NonMovable const& ii) { i = ii.i; return *this; } - operator int() { return i; } + bool operator==(NonMovable const& ii) const { return i == ii.i; } int i; #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES private: @@ -79,7 +79,7 @@ struct CopyableAndMovable CopyableAndMovable(int ii = 0) : i(ii) {} CopyableAndMovable(CopyableAndMovable const& ii) : i(ii.i) {} CopyableAndMovable & operator=(CopyableAndMovable const& ii) { i = ii.i; return *this; } - operator int() { return i; } + bool operator==(CopyableAndMovable const& ii) const { return i == ii.i; } int i; #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES CopyableAndMovable(CopyableAndMovable && ii) : i(std::move(ii.i)) {} @@ -197,7 +197,7 @@ void test_detail() // Storing pointers in a std::vector is not possible in MinGW C++98 #if __cplusplus >= 201103L - std::vector v2(10, 0); + std::vector v2(10, (bgt::NonMovable*)NULL); bgr::detail::copy_or_move(v2.begin() + 1, v2.begin() + 10, v2.begin()); BOOST_CHECK(boost::size(v2) == 10); bgr::erase(v2, v2.begin() + 1);