diff options
author | Francisco Jerez <[email protected]> | 2013-09-17 23:13:48 -0700 |
---|---|---|
committer | Francisco Jerez <[email protected]> | 2013-10-21 10:47:02 -0700 |
commit | 8e14b82fd2c561cac3e0d5f84d5f67815ad53867 (patch) | |
tree | 140cc8c26fb0f55ceec664e1e5650325ba98771d /src/gallium/state_trackers/clover/api/transfer.cpp | |
parent | ebfdce079b8f99f92dff4d58a53c27e0888c373f (diff) |
clover: Replace a bunch of double underscores with single underscores.
Identifiers with double underscores are reserved, and using them has
undefined behavior according to the C++ spec. It's unlikely to make
any difference, but...
Tested-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/clover/api/transfer.cpp')
-rw-r--r-- | src/gallium/state_trackers/clover/api/transfer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/clover/api/transfer.cpp b/src/gallium/state_trackers/clover/api/transfer.cpp index 1615d6fdfdd..43036da528d 100644 --- a/src/gallium/state_trackers/clover/api/transfer.cpp +++ b/src/gallium/state_trackers/clover/api/transfer.cpp @@ -67,9 +67,9 @@ namespace { /// \a T. The return value of get() should be implicitly /// convertible to \a void *. /// - template<typename T> struct __map; + template<typename T> struct _map; - template<> struct __map<void *> { + template<> struct _map<void *> { static void * get(cl_command_queue q, void *obj, cl_map_flags flags, size_t offset, size_t size) { @@ -77,7 +77,7 @@ namespace { } }; - template<> struct __map<const void *> { + template<> struct _map<const void *> { static const void * get(cl_command_queue q, const void *obj, cl_map_flags flags, size_t offset, size_t size) { @@ -85,7 +85,7 @@ namespace { } }; - template<> struct __map<memory_obj *> { + template<> struct _map<memory_obj *> { static mapping get(cl_command_queue q, memory_obj *obj, cl_map_flags flags, size_t offset, size_t size) { @@ -104,9 +104,9 @@ namespace { S src_obj, const point &src_orig, const point &src_pitch, const point ®ion) { return [=](event &) { - auto dst = __map<T>::get(q, dst_obj, CL_MAP_WRITE, + auto dst = _map<T>::get(q, dst_obj, CL_MAP_WRITE, dst_pitch(dst_orig), dst_pitch(region)); - auto src = __map<S>::get(q, src_obj, CL_MAP_READ, + auto src = _map<S>::get(q, src_obj, CL_MAP_READ, src_pitch(src_orig), src_pitch(region)); point p; |