Fix for namespace collision with #define RAJA

This commit is contained in:
Matthew Martineau 2016-05-06 10:51:35 +01:00
parent 45381da0b2
commit 3b266b8266

View File

@ -22,7 +22,7 @@
#include "CUDAStream.h" #include "CUDAStream.h"
#elif defined(OCL) #elif defined(OCL)
#include "OCLStream.h" #include "OCLStream.h"
#elif defined(RAJA) #elif defined(USE_RAJA)
#include "RAJAStream.hpp" #include "RAJAStream.hpp"
#elif defined(KOKKOS) #elif defined(KOKKOS)
#include "KOKKOSStream.hpp" #include "KOKKOSStream.hpp"
@ -89,7 +89,7 @@ void run()
// Use the OpenCL implementation // Use the OpenCL implementation
stream = new OCLStream<T>(ARRAY_SIZE, deviceIndex); stream = new OCLStream<T>(ARRAY_SIZE, deviceIndex);
#elif defined(RAJA) #elif defined(USE_RAJA)
// Use the RAJA implementation // Use the RAJA implementation
stream = new RAJAStream<T>(ARRAY_SIZE, deviceIndex); stream = new RAJAStream<T>(ARRAY_SIZE, deviceIndex);