STL provides no implicit boolean conversion for streams, so use good()
for this purpose. Add gtest/gmock fixes for libc++.


(joerg)

$NetBSD: patch-src_lib_server_CConfig.cpp,v 1.1 2013/05/11 21:40:14 joerg Exp $

--- src/lib/server/CConfig.cpp.orig	2011-01-21 03:51:35.000000000 +0000
+++ src/lib/server/CConfig.cpp
@@ -1908,9 +1908,9 @@ CConfigReadContext::getLineNumber() cons
 	return m_line;
 }
 
-CConfigReadContext::operator void*() const
+CConfigReadContext::operator bool() const
 {
-	return m_stream;
+	return m_stream.good();
 }
 
 bool

$NetBSD: patch-src_lib_server_CConfig.h,v 1.1 2013/05/11 21:40:14 joerg Exp $

--- src/lib/server/CConfig.h.orig	2013-05-10 12:35:59.000000000 +0000
+++ src/lib/server/CConfig.h
@@ -483,7 +483,7 @@ public:
 	bool			readLine(CString&);
 	UInt32			getLineNumber() const;
 
-	operator void*() const;
+	operator bool() const;
 	bool			operator!() const;
 
 	OptionValue		parseBoolean(const CString&) const;

$NetBSD: patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h,v 1.1 2013/05/11 21:40:14 joerg Exp $

--- tools/gmock-1.6.0/include/gmock/internal/gmock-port.h.orig	2011-05-07 02:25:30.000000000 +0000
+++ tools/gmock-1.6.0/include/gmock/internal/gmock-port.h
@@ -50,6 +50,14 @@
 // tr1/tuple.  gmock-port.h does this via gtest-port.h, which is
 // guaranteed to pull in the tuple header.
 
+#if __cplusplus >= 201103L
+namespace std {
+  namespace tr1 {
+    using ::std::make_tuple;
+  }
+}
+#endif
+
 // For MS Visual C++, check the compiler version. At least VS 2003 is
 // required to compile Google Mock.
 #if defined(_MSC_VER) && _MSC_VER < 1310

$NetBSD: patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h,v 1.1 2013/05/11 21:40:14 joerg Exp $

--- tools/gtest-1.6.0/include/gtest/internal/gtest-port.h.orig	2011-05-07 02:25:30.000000000 +0000
+++ tools/gtest-1.6.0/include/gtest/internal/gtest-port.h
@@ -481,6 +481,16 @@
 #  define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
 #  include <tuple>
 
+# elif __cplusplus >= 201103L
+#  include <tuple>
+namespace std {
+  namespace tr1 {
+    using ::std::tuple;
+    using ::std::tuple_element;
+    using ::std::tuple_size;
+    using ::std::get;
+  }
+}
 # elif defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
 // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header.  This does
 // not conform to the TR1 spec, which requires the header to be <tuple>.