From 3b266b826610abbc8dd3ea3f94bf076a30a758ef Mon Sep 17 00:00:00 2001 From: Matthew Martineau Date: Fri, 6 May 2016 10:51:35 +0100 Subject: [PATCH] Fix for namespace collision with #define RAJA --- main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index 5d3a559..f67fdd6 100644 --- a/main.cpp +++ b/main.cpp @@ -22,7 +22,7 @@ #include "CUDAStream.h" #elif defined(OCL) #include "OCLStream.h" -#elif defined(RAJA) +#elif defined(USE_RAJA) #include "RAJAStream.hpp" #elif defined(KOKKOS) #include "KOKKOSStream.hpp" @@ -89,7 +89,7 @@ void run() // Use the OpenCL implementation stream = new OCLStream(ARRAY_SIZE, deviceIndex); -#elif defined(RAJA) +#elif defined(USE_RAJA) // Use the RAJA implementation stream = new RAJAStream(ARRAY_SIZE, deviceIndex);