From d6b7f3da904e0d8eb1dcec356d85a259aa4ff18b Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 3 May 2017 22:38:21 -0700 Subject: [PATCH] Use boost::begin/end instead of macros --- test/is_palindrome_test.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/is_palindrome_test.cpp b/test/is_palindrome_test.cpp index c668e9d..ea2bb26 100644 --- a/test/is_palindrome_test.cpp +++ b/test/is_palindrome_test.cpp @@ -38,9 +38,6 @@ struct functorComparator } }; -#define Begin(arr) (arr) -#define End(arr) (arr+(sizeof(arr)/(sizeof(arr[0])))) - void test_is_palindrome() { const std::list empty; @@ -54,14 +51,14 @@ void test_is_palindrome() // Test a default operator== BOOST_CHECK ( ba::is_palindrome(empty)); BOOST_CHECK ( ba::is_palindrome(singleElement)); - BOOST_CHECK (!ba::is_palindrome(Begin(oddNonPalindrome), End(oddNonPalindrome))); - BOOST_CHECK ( ba::is_palindrome(Begin(oddPalindrome), End(oddPalindrome))); - BOOST_CHECK ( ba::is_palindrome(Begin(evenPalindrome), End(evenPalindrome))); - BOOST_CHECK (!ba::is_palindrome(Begin(evenNonPalindrome), End(evenNonPalindrome))); + BOOST_CHECK (!ba::is_palindrome(boost::begin(oddNonPalindrome), boost::end(oddNonPalindrome))); + BOOST_CHECK ( ba::is_palindrome(boost::begin(oddPalindrome), boost::end(oddPalindrome))); + BOOST_CHECK ( ba::is_palindrome(boost::begin(evenPalindrome), boost::end(evenPalindrome))); + BOOST_CHECK (!ba::is_palindrome(boost::begin(evenNonPalindrome), boost::end(evenNonPalindrome))); //Test the custom comparators BOOST_CHECK ( ba::is_palindrome(empty.begin(), empty.end(), functorComparator())); - BOOST_CHECK (!ba::is_palindrome(Begin(oddNonPalindrome), End(oddNonPalindrome), funcComparator)); + BOOST_CHECK (!ba::is_palindrome(boost::begin(oddNonPalindrome), boost::end(oddNonPalindrome), funcComparator)); BOOST_CHECK ( ba::is_palindrome(evenPalindrome, std::equal_to())); //Test C-strings like cases