diff options
| author | Chad Whipkey <cwhipkey@google.com> | 2017-02-08 18:06:31 +0300 |
|---|---|---|
| committer | Chad Whipkey <cwhipkey@google.com> | 2017-02-08 18:06:31 +0300 |
| commit | 5eab428294d47e02853e9f1251165b9ea71bd3cc (patch) | |
| tree | 469024e7cd563891219fc31a6d4b59e46f93be77 /src | |
| parent | 2a974f5ca2aa12b178046b2206b43f1fd69d9fae (diff) | |
Qualify nullptr_t with std::.
Diffstat (limited to 'src')
| -rw-r--r-- | src/primitives.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/primitives.h b/src/primitives.h index 8f8fb69..bcaeca8 100644 --- a/src/primitives.h +++ b/src/primitives.h @@ -101,7 +101,7 @@ Tptr ptradd(Tptr ptr, int i) { } __device__ __forceinline__ -nullptr_t ptradd(nullptr_t ptr, int i) { +std::nullptr_t ptradd(std::nullptr_t ptr, int i) { return nullptr; } @@ -120,8 +120,8 @@ class Primitives { DST2_T dst2, int len, int maxoffset, int step, SYNC_Ts... flags) { - enum { noSrc2 = std::is_same<SRC2_T, nullptr_t>::value }; - enum { noDst2 = std::is_same<DST2_T, nullptr_t>::value }; + enum { noSrc2 = std::is_same<SRC2_T, std::nullptr_t>::value }; + enum { noDst2 = std::is_same<DST2_T, std::nullptr_t>::value }; static_assert(noSrc2 || std::is_same<SRC2_T, const T*>::value, "src2 must be of type T* or nullptr_t"); static_assert(noDst2 || std::is_same<DST2_T, T*>::value, @@ -146,8 +146,8 @@ class Primitives { THREADS, OpType, T, - !std::is_same<DST2_T, nullptr_t>::value, // HAS_DEST1 - !std::is_same<SRC2_T, nullptr_t>::value // HAS_SRC1 + !std::is_same<DST2_T, std::nullptr_t>::value, // HAS_DEST1 + !std::is_same<SRC2_T, std::nullptr_t>::value // HAS_SRC1 > ( threadIdx.x, |