diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-10-05 13:24:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 13:24:55 +0100 |
| commit | b37a59548f67bf9526202f387f3e8489645f7229 (patch) | |
| tree | 9111893cdd39b595bec469ab6f10fda324000394 | |
| parent | b95c79ab34fa782d336984030b619bfd0df5e46f (diff) | |
| parent | aa0ae59a2a31dc0ee5cc987066903d135a5f9e79 (diff) | |
| download | libgit2-b37a59548f67bf9526202f387f3e8489645f7229.tar.gz | |
Merge pull request #4831 from pks-t/pks/int-conversion
int-conversion
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/core/vector.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47b1cd187..7165cca6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -233,6 +233,7 @@ ELSE () DISABLE_WARNINGS(unused-function) ENABLE_WARNINGS(format) ENABLE_WARNINGS(format-security) + ENABLE_WARNINGS(int-conversion) IF (APPLE) # Apple deprecated OpenSSL DISABLE_WARNINGS(deprecated-declarations) diff --git a/tests/core/vector.c b/tests/core/vector.c index 6b8ea574d..2be7e86bd 100644 --- a/tests/core/vector.c +++ b/tests/core/vector.c @@ -412,7 +412,7 @@ void test_core_vector__dup_empty_vector(void) { git_vector v = GIT_VECTOR_INIT; git_vector dup = GIT_VECTOR_INIT; - void *dummy = 0xDEAFBEEB; + int dummy; cl_assert_equal_i(0, v.length); @@ -420,7 +420,7 @@ void test_core_vector__dup_empty_vector(void) cl_assert_equal_i(0, dup._alloc_size); cl_assert_equal_i(0, dup.length); - cl_git_pass(git_vector_insert(&dup, dummy)); + cl_git_pass(git_vector_insert(&dup, &dummy)); cl_assert_equal_i(8, dup._alloc_size); cl_assert_equal_i(1, dup.length); |