aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/cmake
diff options
context:
space:
mode:
authorEnji Cooper <yaneurabeya@gmail.com>2019-03-08 11:09:00 -0800
committerEnji Cooper <yaneurabeya@gmail.com>2019-04-05 21:30:19 -0700
commit3829b84e9927a2a77a7634a8e7b010cc57095e1b (patch)
tree14762102e4f3bb5c34ff91711ce181a95574b812 /googletest/cmake
parent5ba69d5cb93779fba14bf438dfdaf589e2b92071 (diff)
downloadgoogletest-3829b84e9927a2a77a7634a8e7b010cc57095e1b.tar.gz
googletest-3829b84e9927a2a77a7634a8e7b010cc57095e1b.tar.bz2
googletest-3829b84e9927a2a77a7634a8e7b010cc57095e1b.zip
clang: fix `-Wsign-conversion` errors
Cast some values as their unsigned equivalents or `size_t` to match the parameter type used for the template object under test. Also, provide UInt32 equivalent delegate methods for some callers (with int-equivalents for backwards compatibility). This closes #2146. Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
Diffstat (limited to 'googletest/cmake')
-rw-r--r--googletest/cmake/internal_utils.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index dfa72fa4..04def60f 100644
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -78,7 +78,7 @@ macro(config_compiler_and_linker)
# http://stackoverflow.com/questions/3232669 explains the issue.
set(cxx_base_flags "${cxx_base_flags} -wd4702")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
- set(cxx_base_flags "-Wall -Wshadow -Werror -Wno-error=sign-conversion")
+ set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion")
set(cxx_exception_flags "-fexceptions")
set(cxx_no_exception_flags "-fno-exceptions")
set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls")