1 files changed, 190 insertions, 0 deletions
diff --git a/src/boost/libs/contract/test/old/no_macro.hpp b/src/boost/libs/contract/test/old/no_macro.hpp
new file mode 100644
index 00000000..1e75ac44
--- /dev/null
+++ b/src/boost/libs/contract/test/old/no_macro.hpp
@@ -0,0 +1,190 @@
+
+// Copyright (C) 2008-2018 Lorenzo Caminiti
+// Distributed under the Boost Software License, Version 1.0 (see accompanying
+// file LICENSE_1_0.txt or a copy at http://www.boost.org/LICENSE_1_0.txt).
+// See: http://www.boost.org/doc/libs/release/libs/contract/doc/html/index.html
+
+// Test old values without BOOST_CONTRACT_OLD macro.
+
+#ifndef BOOST_CONTRACT_TEST_OLD_PTR_TYPE
+    #error "must define BOOST_CONTRACT_TEST_OLD_PTR_TYPE"
+#endif
+
+#include "../detail/oteststream.hpp"
+#include "../detail/counter.hpp"
+#include <boost/contract/function.hpp>
+#include <boost/contract/public_function.hpp>
+#include <boost/contract/base_types.hpp>
+#include <boost/contract/override.hpp>
+#include <boost/contract/assert.hpp>
+#include <boost/contract/old.hpp>
+#include <boost/contract/check.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <cassert>
+
+boost::contract::test::detail::oteststream out;
+
+struct i_tag; typedef boost::contract::test::detail::counter<i_tag, int> i_type;
+struct j_tag; typedef boost::contract::test::detail::counter<j_tag, int> j_type;
+
+struct b {
+    virtual void swap(i_type& i, j_type& j, boost::contract::virtual_* v = 0);
+};
+
+void b::swap(i_type& i, j_type& j, boost::contract::virtual_* v) {
+    BOOST_CONTRACT_TEST_OLD_PTR_TYPE<i_type> old_i = boost::contract::make_old(
+        v, boost::contract::copy_old(v) ?
+            i_type::eval(i)
+        :
+            boost::contract::null_old()
+    );
+    BOOST_CONTRACT_TEST_OLD_PTR_TYPE<j_type> old_j;
+    boost::contract::check c = boost::contract::public_function(v, this)
+        .precondition([&] {
+            out << "b::swap::pre" << std::endl;
+            BOOST_CONTRACT_ASSERT(i.value != j.value);
+        })
+        .old([&] {
+            out << "b::swap::old" << std::endl;
+            old_j = boost::contract::make_old(v, boost::contract::copy_old(v) ?
+                    j_type::eval(j) : boost::contract::null_old());
+        })
+        .postcondition([&] {
+            out << "b::swap::post" << std::endl;
+            BOOST_CONTRACT_ASSERT(i.value == old_j->value);
+            BOOST_CONTRACT_ASSERT(j.value == old_i->value);
+        })
+    ;
+    assert(false);
+}
+
+struct a
+    #define BASES public b
+    : BASES
+{
+    typedef BOOST_CONTRACT_BASE_TYPES(BASES) base_types;
+    #undef BASES
+
+    void swap(i_type& i, j_type& j, boost::contract::virtual_* v = 0)
+            /* override */ {
+        boost::contract::check c = boost::contract::public_function<
+                override_swap>(v, &a::swap, this, i, j);
+    
+        out << "a::swap::body" << std::endl;
+        int t = i.value;
+        i.value = j.value;
+        j.value = t;
+    }
+    BOOST_CONTRACT_OVERRIDE(swap)
+};
+
+struct x_tag;
+typedef boost::contract::test::detail::counter<x_tag, char> x_type;
+
+struct y_tag;
+typedef boost::contract::test::detail::counter<y_tag, char> y_type;
+
+void swap(x_type& x, y_type& y) {
+    BOOST_CONTRACT_TEST_OLD_PTR_TYPE<x_type> old_x = boost::contract::make_old(
+        boost::contract::copy_old() ?
+            x_type::eval(x)
+        :
+            boost::contract::null_old()
+    );
+    BOOST_CONTRACT_TEST_OLD_PTR_TYPE<y_type> old_y;
+    boost::contract::check c = boost::contract::function()
+        .precondition([&] {
+            out << "swap::pre" << std::endl;
+            BOOST_CONTRACT_ASSERT(x.value != y.value);
+        })
+        .old([&] {
+            out << "swap::old" << std::endl;
+            old_y = boost::contract::make_old(boost::contract::copy_old() ?
+                    y_type::eval(y) : boost::contract::null_old());
+        })
+        .postcondition([&] {
+            out << "swap::post" << std::endl;
+            BOOST_CONTRACT_ASSERT(x.value == old_y->value);
+            BOOST_CONTRACT_ASSERT(y.value == old_x->value);
+        })
+    ;
+
+    out << "swap::body" << std::endl;
+    char t = x.value;
+    x.value = y.value;
+    y.value = t;
+}
+
+int main() {
+    std::ostringstream ok;
+
+    out.str("");
+    x_type x; x.value = 'a';
+    y_type y; y.value = 'b';
+    swap(x, y);
+    
+    ok.str(""); ok
+        #ifndef BOOST_CONTRACT_NO_PRECONDITIONS
+            << "swap::pre" << std::endl
+        #endif
+        #ifndef BOOST_CONTRACT_NO_OLDS
+            << "swap::old" << std::endl
+        #endif
+        << "swap::body" << std::endl
+        #ifndef BOOST_CONTRACT_NO_POSTCONDITIONS
+            << "swap::post" << std::endl
+        #endif
+    ;
+    BOOST_TEST(out.eq(ok.str()));
+
+    #ifndef BOOST_CONTRACT_NO_OLDS
+        #define BOOST_CONTRACT_TEST_old 1u
+    #else
+        #define BOOST_CONTRACT_TEST_old 0u
+    #endif
+    
+    BOOST_TEST_EQ(x.value, 'b');
+    BOOST_TEST_EQ(x.copies(), BOOST_CONTRACT_TEST_old);
+    BOOST_TEST_EQ(x.evals(), BOOST_CONTRACT_TEST_old);
+    BOOST_TEST_EQ(x.ctors(), x.dtors() + 1); // 1 for local var.
+    
+    BOOST_TEST_EQ(y.value, 'a');
+    BOOST_TEST_EQ(y.copies(), BOOST_CONTRACT_TEST_old);
+    BOOST_TEST_EQ(y.evals(), BOOST_CONTRACT_TEST_old);
+    BOOST_TEST_EQ(y.ctors(), y.dtors() + 1); // 1 for local var.
+
+    a aa;
+    i_type i; i.value = 1;
+    j_type j; j.value = 2;
+    out.str("");
+    aa.swap(i, j);
+    
+    ok.str(""); ok
+        #ifndef BOOST_CONTRACT_NO_PRECONDITIONS
+            << "b::swap::pre" << std::endl
+        #endif
+        #ifndef BOOST_CONTRACT_NO_OLDS
+            << "b::swap::old" << std::endl
+        #endif
+        << "a::swap::body" << std::endl
+        #ifndef BOOST_CONTRACT_NO_POSTCONDITIONS
+            << "b::swap::old" << std::endl
+            << "b::swap::post" << std::endl
+        #endif
+    ;
+    BOOST_TEST(out.eq(ok.str()));
+    
+    BOOST_TEST_EQ(i.value, 2);
+    BOOST_TEST_EQ(i.copies(), BOOST_CONTRACT_TEST_old);
+    BOOST_TEST_EQ(i.evals(), BOOST_CONTRACT_TEST_old);
+    BOOST_TEST_EQ(i.ctors(), i.dtors() + 1); // 1 for local var.
+    
+    BOOST_TEST_EQ(j.value, 1);
+    BOOST_TEST_EQ(j.copies(), BOOST_CONTRACT_TEST_old);
+    BOOST_TEST_EQ(j.evals(), BOOST_CONTRACT_TEST_old);
+    BOOST_TEST_EQ(j.ctors(), j.dtors() + 1); // 1 for local var.
+
+    #undef BOOST_CONTRACT_TEST_old
+    return boost::report_errors();
+}
+