diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-08-25 15:22:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-08-25 15:49:34 +0300 |
| commit | aa7dc5fa1df23f1a9079305cb362aab018e94848 (patch) | |
| tree | 68c4825581e939b4dd8af5c7d1fa7ef848bf4fb8 /opencl/inc | |
| parent | 407a126af45d93f83eb4dbdc358dd569bea4db6f (diff) | |
Get rid of need to use initial :: for ::opencl to avoid clash with sc::opencl
Rename the global opencl namespace to openclwrapper. Its public API is
after all declared in a file called openclwrapper.hxx. The confusion
started when part of the OpenCL code was moved out from sc some years
ago.
Change-Id: I98ebd8498b2244804411e5de9169eb619f86070b
Diffstat (limited to 'opencl/inc')
| -rw-r--r-- | opencl/inc/opencl_device.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/opencl/inc/opencl_device.hxx b/opencl/inc/opencl_device.hxx index 4fc75cf443f8..b69cbabc28a5 100644 --- a/opencl/inc/opencl_device.hxx +++ b/opencl/inc/opencl_device.hxx @@ -10,16 +10,13 @@ #ifndef INCLUDED_OPENCL_INC_OPENCL_DEVICE_HXX #define INCLUDED_OPENCL_INC_OPENCL_DEVICE_HXX -#include "opencl_device_selection.h" +#include <opencl/openclwrapper.hxx> -namespace opencl { +#include "opencl_device_selection.h" ds_device const & getDeviceSelection(OUString const & pFileName, bool bForceSelection); -struct GPUEnv; -void releaseOpenCLEnv( GPUEnv *gpuInfo ); - -} +void releaseOpenCLEnv( openclwrapper::GPUEnv *gpuInfo ); #endif |