From c83c1a9b00bc898ec2a8ea5e54e240039e1dc892 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 7 Jun 2012 19:50:10 +0000
Subject: [PATCH] Hash: Merge test fix.

[SVN r78854]
---
 hash/test/hash_type_index_test.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hash/test/hash_type_index_test.cpp b/hash/test/hash_type_index_test.cpp
index 7892918..917bca9 100644
--- a/hash/test/hash_type_index_test.cpp
+++ b/hash/test/hash_type_index_test.cpp
@@ -18,12 +18,16 @@
 #include <typeindex>
 
 void test_type_index() {
+    HASH_NAMESPACE::hash<std::type_index> hasher;
+
+#if defined(BOOST_NO_TYPEID)
+    std::cout<<"Unable to test std::type_index, as typeid isn't available"
+        <<std::endl;
+#else
     std::type_index int_index = typeid(int);
     std::type_index int2_index = typeid(int);
     std::type_index char_index = typeid(char);
     
-    HASH_NAMESPACE::hash<std::type_index> hasher;
-    
     BOOST_TEST(hasher(int_index) == int_index.hash_code());
     BOOST_TEST(hasher(int_index) == int2_index.hash_code());
     BOOST_TEST(hasher(char_index) == char_index.hash_code());
@@ -33,6 +37,7 @@ void test_type_index() {
 
     BOOST_TEST(hasher(int_index) == hasher(int2_index));
     BOOST_TEST(hasher(int_index) != hasher(char_index));
+#endif
 }
 #endif