diff options
| author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-12-03 23:15:40 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-12-03 23:15:40 +0000 |
| commit | 2ba84be6837768b0bb204ea9b11b0aee8cb95883 (patch) | |
| tree | bd8ceb355713073ae2b5d632b1ac5f45de8fc3de /include | |
| parent | 022d52c97955a7c499435c3a9e03a3c74b7ebc29 (diff) | |
| download | googletest-2ba84be6837768b0bb204ea9b11b0aee8cb95883.tar.gz | |
Fix warnings encountered with clang -Wall.
git-svn-id: http://googletest.googlecode.com/svn/trunk@670 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'include')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index a6726b4..b5c6446 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -810,8 +810,8 @@ class Secret; // expression is true. For example, you could use it to verify the // size of a static array: // -// GTEST_COMPILE_ASSERT_(ARRAYSIZE(content_type_names) == CONTENT_NUM_TYPES, -// content_type_names_incorrect_size); +// GTEST_COMPILE_ASSERT_(GTEST_ARRAY_SIZE_(names) == NUM_NAMES, +// names_incorrect_size); // // or to make sure a struct is smaller than a certain size: // @@ -879,6 +879,9 @@ struct StaticAssertTypeEqHelper; template <typename T> struct StaticAssertTypeEqHelper<T, T> {}; +// Evaluates to the number of elements in 'array'. +#define GTEST_ARRAY_SIZE_(array) (sizeof(array) / sizeof(array[0])) + #if GTEST_HAS_GLOBAL_STRING typedef ::string string; #else |