diff options
| author | Lu Guanqun <guanqun.lu@intel.com> | 2013-08-20 14:45:15 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@linux.intel.com> | 2013-08-21 11:17:19 +0800 |
| commit | b961e99442ce7de6a1498946a47baa4a732b870b (patch) | |
| tree | 12b6282821041dee04f712ecca8ca9e833beb47f /utests/compiler_abs_diff.cpp | |
| parent | 17c028da39b35f979ffd8cd2ed10cc4b305a14ca (diff) | |
| download | beignet-b961e99442ce7de6a1498946a47baa4a732b870b.tar.gz | |
rename ulong to ulong64 to avoid the conflicts in <sys/types.h>
[ 31%] Building CXX object utests/CMakeFiles/utests.dir/compiler_abs_diff.cpp.o
/home/q/beignet.git/utests/compiler_abs_diff.cpp:201:18: error: conflicting declaration ‘typedef uint64_t ulong’
/usr/include/i386-linux-gnu/sys/types.h:151:27: error: ‘ulong’ has a previous declaration as ‘typedef long unsigned int ulong’
Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'utests/compiler_abs_diff.cpp')
| -rw-r--r-- | utests/compiler_abs_diff.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utests/compiler_abs_diff.cpp b/utests/compiler_abs_diff.cpp index f89d0010..71881b17 100644 --- a/utests/compiler_abs_diff.cpp +++ b/utests/compiler_abs_diff.cpp @@ -196,13 +196,13 @@ template <typename T, typename U> static void compiler_abs_diff_with_type(void) typedef unsigned char uchar; typedef unsigned short ushort; typedef unsigned int uint; -typedef uint64_t ulong; +typedef uint64_t ulong64; ABS_TEST_DIFF_TYPE(int, uint) -ABS_TEST_DIFF_TYPE_2(int64_t, long, ulong) +ABS_TEST_DIFF_TYPE_2(int64_t, long, ulong64) ABS_TEST_DIFF_TYPE(short, ushort) ABS_TEST_DIFF_TYPE(char, uchar) ABS_TEST_DIFF_TYPE(uint, uint) -ABS_TEST_DIFF_TYPE(ulong, ulong) +ABS_TEST_DIFF_TYPE_2(ulong64, ulong, ulong64) ABS_TEST_DIFF_TYPE(ushort, ushort) ABS_TEST_DIFF_TYPE(uchar, uchar) |