diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:01:25 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:01:25 +0000 |
| commit | e4b9c93fc1b531fe0cfe25a042f6b81c1e7c15c0 (patch) | |
| tree | 1656513dd240b9ed4690589b9934d0e5371694fb /utils/unittest/googletest/include/gtest/internal/gtest-param-util.h | |
| parent | 18f30e6f5e80787808fe1455742452a5210afe07 (diff) | |
Merge gtest-1.3.0.
OSX users: make sure that CrashReporter is disabled when running unit tests.
Death tests are enabled now so you'll get a ton of message boxes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105352 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest/googletest/include/gtest/internal/gtest-param-util.h')
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-param-util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h b/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h index 3bb07ecfc0..5559ab4492 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-param-util.h @@ -40,7 +40,7 @@ #include <gtest/internal/gtest-port.h> -#ifdef GTEST_HAS_PARAM_TEST +#if GTEST_HAS_PARAM_TEST #if GTEST_HAS_RTTI #include <typeinfo> |