/*
 * LibCassandra
 * Copyright (C) 2010-2011 Padraig O'Sullivan, Ewen Cheslack-Postava
 * All rights reserved.
 *
 * Use and distribution licensed under the BSD license. See
 * the COPYING file in the parent directory for full text.
 */

#ifndef __LIBCASSANDRA_UTIL_PLATFORM_H
#define __LIBCASSANDRA_UTIL_PLATFORM_H

#ifdef __GNUC__

// #include_next is broken: it does not search default include paths!
#define BOOST_TR1_DISABLE_INCLUDE_NEXT
// config_all.hpp reads this variable, then sets BOOST_HAS_INCLUDE_NEXT anyway
#include <boost/tr1/detail/config_all.hpp>
#ifdef BOOST_HAS_INCLUDE_NEXT
// This behavior has existed since boost 1.34, unlikely to change.
#undef BOOST_HAS_INCLUDE_NEXT
#endif

#endif
#endif

#include <boost/tr1/memory.hpp>
#include <boost/tr1/tuple.hpp>
#include <boost/tr1/unordered_map.hpp>

#include <string>
#include <vector>
#include <map>
#include <set>

#endif //__LIBCASSANDRA_UTIL_PLATFORM_H

/*
 * LibCassandra
 * Copyright (C) 2010-2011 Padraig O'Sullivan, Ewen Cheslack-Postava
 * All rights reserved.
 *
 * Use and distribution licensed under the BSD license. See
 * the COPYING file in the parent directory for full text.
 */

#ifndef __LIBCASSANDRA_UTIL_PLATFORM_H
#define __LIBCASSANDRA_UTIL_PLATFORM_H

#include <boost/tr1/memory.hpp>
#include <boost/tr1/tuple.hpp>
#include <boost/tr1/unordered_map.hpp>

#include <string>
#include <vector>
#include <map>
#include <set>

#endif //__LIBCASSANDRA_UTIL_PLATFORM_H

--- 
+++ 
@@ -10,6 +10,20 @@
 #ifndef __LIBCASSANDRA_UTIL_PLATFORM_H
 #define __LIBCASSANDRA_UTIL_PLATFORM_H
 
+#ifdef __GNUC__
+
+// #include_next is broken: it does not search default include paths!
+#define BOOST_TR1_DISABLE_INCLUDE_NEXT
+// config_all.hpp reads this variable, then sets BOOST_HAS_INCLUDE_NEXT anyway
+#include <boost/tr1/detail/config_all.hpp>
+#ifdef BOOST_HAS_INCLUDE_NEXT
+// This behavior has existed since boost 1.34, unlikely to change.
+#undef BOOST_HAS_INCLUDE_NEXT
+#endif
+
+#endif
+#endif
+
 #include <boost/tr1/memory.hpp>
 #include <boost/tr1/tuple.hpp>
 #include <boost/tr1/unordered_map.hpp>
Disable boost's include_next functionality, fixes compatibility with Sirikata.
