From 1d32532ead24125b485125c9644cf915b68016bc Mon Sep 17 00:00:00 2001
From: "liujisi@google.com"
 <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Tue, 4 Dec 2012 23:32:47 +0000
Subject: Update gtest to 1.6; Disable death tests when exceptions are enabled.

---
 src/google/protobuf/testing/googletest.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/google/protobuf/testing')

diff --git a/src/google/protobuf/testing/googletest.h b/src/google/protobuf/testing/googletest.h
index 6b17ae4f..003be106 100644
--- a/src/google/protobuf/testing/googletest.h
+++ b/src/google/protobuf/testing/googletest.h
@@ -38,6 +38,11 @@
 #include <vector>
 #include <google/protobuf/stubs/common.h>
 
+// Disable death tests if we use exceptions in CHECK().
+#if !PROTOBUF_USE_EXCEPTIONS && defined(GTEST_HAS_DEATH_TEST)
+#define PROTOBUF_HAS_DEATH_TEST
+#endif
+
 namespace google {
 namespace protobuf {
 
-- 
cgit v1.2.3