diff options
Diffstat (limited to 'gpu/command_buffer/client/ref_counted.h')
| -rw-r--r-- | gpu/command_buffer/client/ref_counted.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gpu/command_buffer/client/ref_counted.h b/gpu/command_buffer/client/ref_counted.h index 83346d35..e3c8f27 100644 --- a/gpu/command_buffer/client/ref_counted.h +++ b/gpu/command_buffer/client/ref_counted.h @@ -5,7 +5,11 @@ #ifndef GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ #define GPU_COMMAND_BUFFER_CLIENT_REF_COUNTED_H_ -#if defined(__native_client__) +// TODO(bbudge) The NaCl SRPC proxy can't depend on base, so we define our own +// ref_counted. This causes duplicate class warnings in the NaCl IPC proxy, +// which uses base. Remove the custom ref_counted class after NaCl has switched +// proxies. +#if defined(__native_client__) && !defined(NACL_PPAPI_IPC_PROXY) #include "native_client/src/include/ref_counted.h" namespace gpu { using nacl::RefCountedThreadSafe; |