diff options
| author | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
| commit | fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc (patch) | |
| tree | 1446cb018eb05571b4eff101ceae937688e83a1d /tests-clar/clar_libgit2.h | |
| parent | de8fe729efd350ae5cb1ef25ffb08f92c6f706b9 (diff) | |
| parent | ab1368766240cfe861729642abe1cddd01c0203e (diff) | |
| download | libgit2-fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc.tar.gz | |
Merge branch 'development' into blame
Conflicts:
include/git2.h
Diffstat (limited to 'tests-clar/clar_libgit2.h')
| -rw-r--r-- | tests-clar/clar_libgit2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests-clar/clar_libgit2.h b/tests-clar/clar_libgit2.h index 9d4d63e6c..b9ef5627e 100644 --- a/tests-clar/clar_libgit2.h +++ b/tests-clar/clar_libgit2.h @@ -44,7 +44,7 @@ GIT_INLINE(void) clar__assert_in_range( } #define cl_assert_equal_sz(sz1,sz2) do { \ - size_t __sz1 = (sz1), __sz2 = (sz2); \ + size_t __sz1 = (size_t)(sz1), __sz2 = (size_t)(sz2); \ clar__assert_equal(__FILE__,__LINE__,#sz1 " != " #sz2, 1, "%"PRIuZ, __sz1, __sz2); \ } while (0) @@ -52,10 +52,10 @@ GIT_INLINE(void) clar__assert_in_range( clar__assert_in_range((L),(V),(H),__FILE__,__LINE__,"Range check: " #V " in [" #L "," #H "]", 1) #define cl_assert_equal_file(DATA,SIZE,PATH) \ - clar__assert_equal_file(DATA,SIZE,0,PATH,__FILE__,__LINE__) + clar__assert_equal_file(DATA,SIZE,0,PATH,__FILE__,(int)__LINE__) #define cl_assert_equal_file_ignore_cr(DATA,SIZE,PATH) \ - clar__assert_equal_file(DATA,SIZE,1,PATH,__FILE__,__LINE__) + clar__assert_equal_file(DATA,SIZE,1,PATH,__FILE__,(int)__LINE__) void clar__assert_equal_file( const char *expected_data, @@ -63,7 +63,7 @@ void clar__assert_equal_file( int ignore_cr, const char *path, const char *file, - size_t line); + int line); /* * Some utility macros for building long strings |