From efac4023df5f9fb63374cfb78abc93b1f0f2f6bf Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@maps.me>
Date: Fri, 20 Feb 2015 22:20:29 +0300
Subject: C++11 way for logging & macroses.

---
 testing/testing.hpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'testing')

diff --git a/testing/testing.hpp b/testing/testing.hpp
index df678f7219..5f6b671d14 100644
--- a/testing/testing.hpp
+++ b/testing/testing.hpp
@@ -26,36 +26,36 @@ namespace my
 }
 
 #define TEST(X, msg) { if (X) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X")", ::my::impl::Message msg));}}
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X")", ::my::impl::Message msg));}}
 #define TEST_EQUAL(X, Y, msg) { if ((X) == (Y)) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" == "#Y")", \
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" == "#Y")", \
                                                  ::my::impl::Message(X, Y), \
                                                  ::my::impl::Message msg));}}
 #define TEST_NOT_EQUAL(X, Y, msg) { if ((X) != (Y)) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" != "#Y")", \
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" != "#Y")", \
                                                  ::my::impl::Message(X, Y), \
                                                  ::my::impl::Message msg));}}
 #define TEST_LESS(X, Y, msg) { if ((X) < (Y)) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" < "#Y")", \
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" < "#Y")", \
                                                  ::my::impl::Message(X, Y), \
                                                  ::my::impl::Message msg));}}
 #define TEST_LESS_OR_EQUAL(X, Y, msg) { if ((X) <= (Y)) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" <= "#Y")", \
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" <= "#Y")", \
                                                  ::my::impl::Message(X, Y), \
                                                  ::my::impl::Message msg));}}
 #define TEST_GREATER(X, Y, msg) { if ((X) > (Y)) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" > "#Y")", \
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" > "#Y")", \
                                                  ::my::impl::Message(X, Y), \
                                                  ::my::impl::Message msg));}}
 #define TEST_GREATER_OR_EQUAL(X, Y, msg) { if ((X) >= (Y)) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST("#X" >= "#Y")", \
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST("#X" >= "#Y")", \
                                                  ::my::impl::Message(X, Y), \
                                                  ::my::impl::Message msg));}}
 #define TEST_ALMOST_EQUAL(X, Y, msg) { if (::my::AlmostEqual(X, Y)) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST(my::AlmostEqual("#X", "#Y")", \
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST(my::AlmostEqual("#X", "#Y")", \
                                                  ::my::impl::Message(X, Y), \
                                                  ::my::impl::Message msg));}}
 #define TEST_NOT_ALMOST_EQUAL(X, Y, msg) { if (!::my::AlmostEqual(X, Y)) {} else { \
-  ::my::OnTestFailed(SRC(), ::my::impl::MergeMsg("TEST(!my::AlmostEqual("#X", "#Y")", \
+  ::my::OnTestFailed(SRC(), ::my::impl::Message("TEST(!my::AlmostEqual("#X", "#Y")", \
                                                  ::my::impl::Message(X, Y), \
                                                  ::my::impl::Message msg));}}
-- 
cgit v1.2.3