From 745bf9bee1792800d23b9dce310dca1eaba2e551 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Sun, 14 Jun 2015 18:05:58 +0100
Subject: [PATCH] Fix for Oracle+STLPort.

---
 test/decay_test.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/decay_test.cpp b/test/decay_test.cpp
index 33b9249..cf22e15 100644
--- a/test/decay_test.cpp
+++ b/test/decay_test.cpp
@@ -120,20 +120,24 @@ TT_TEST_BEGIN(decay)
    typedef int f1_type(void);
    typedef int f2_type(int);
 
-   BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same< 
+   BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same<
           ::tt::decay<f1_type>::type,int (*)(void)>::value),
                                   true );
    BOOST_CHECK_INTEGRAL_CONSTANT((::tt::is_same< 
           ::tt::decay<f2_type>::type,int (*)(int)>::value),
                                   true );
 
+#ifndef BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS
+   //
+   // Don't test this if the std lib has no templated constructors (Oracle+STLPort):
+   //
    std::pair<std::string,std::string> p  = boost::make_pair( "foo", "bar" );
    std::pair<std::string, int>        p2 = boost::make_pair( "foo", 1 );
 #ifndef BOOST_NO_STD_WSTRING
    std::pair<std::wstring,std::string> p3  = boost::make_pair( L"foo", "bar" );
    std::pair<std::wstring, int>        p4  = boost::make_pair( L"foo", 1 );
 #endif
-
+#endif
    //
    // Todo: make these work sometime. The test id not directly
    //       related to decay<T>::type and can be avoided for now.