diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-05-04 16:11:02 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-05-04 16:11:02 +0000 |
| commit | 750ce4d809c7e2a298a389a512a17652ff5be3f2 (patch) | |
| tree | 70fbd90da02177c8e6ef82adba9fa8ace285a5e3 /utils/unittest/googletest/include/gtest | |
| parent | 5f970ec96e421f64db6b1c6509a902ea73d98cc7 (diff) | |
| download | FreeBSD-src-750ce4d809c7e2a298a389a512a17652ff5be3f2.zip FreeBSD-src-750ce4d809c7e2a298a389a512a17652ff5be3f2.tar.gz | |
Update LLVM to r103004.
Diffstat (limited to 'utils/unittest/googletest/include/gtest')
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h | 1 | ||||
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-port.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h b/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h index f98af0b..d4c7a39 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-linked_ptr.h @@ -176,6 +176,7 @@ class linked_ptr { // Sole ownership by this linked_ptr object is required. T* release() { bool last = link_.depart(); + (void) last; assert(last); T* v = value_; value_ = NULL; diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 3e49993..20a95c9 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -227,9 +227,10 @@ // TODO(wan@google.com): uses autoconf to detect whether ::std::wstring // is available. -#if defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) +#if defined(GTEST_OS_CYGWIN) || defined(GTEST_OS_SOLARIS) || defined(GTEST_OS_HAIKU) || defined(_MINIX) // At least some versions of cygwin don't support ::std::wstring. // Solaris' libc++ doesn't support it either. +// Minix currently doesn't support it either. #define GTEST_HAS_STD_WSTRING 0 #else #define GTEST_HAS_STD_WSTRING GTEST_HAS_STD_STRING |
