Corrected condition to verify if additional pragma is necessary (issue …

…KhronosGroup#142, basic)

test_conformance/basic/test_explicit_s2v.cpp

@@ -26,6 +26,8 @@
 #include "harness/conversions.h"
 #include "harness/typeWrappers.h"
 
+namespace {
+
 // clang-format off
 
 #define DECLARE_S2V_IDENT_KERNEL(srctype,dsttype,size) \
@@ -286,10 +288,10 @@ struct TypesIterator
             };
 
             std::stringstream sstr;
-            if (srcType == kDouble || dstType == kDouble)
+            if (srcT == kDouble || dstT == kDouble)
                 sstr << "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n";
 
-            if (srcType == kHalf || dstType == kHalf)
+            if (srcT == kHalf || dstT == kHalf)
                 sstr << "#pragma OPENCL EXTENSION cl_khr_fp16 : enable\n";
 
             snprintf(pragma, sizeof(pragma), "%s", sstr.str().c_str());
@@ -333,6 +335,8 @@ struct TypesIterator
         128; // hardcoded in original test
 };
 
+} // anonymous namespace
+
 int test_explicit_s2v(cl_device_id deviceID, cl_context context,
                       cl_command_queue queue, int num_elements)
 {

test_conformance/basic/test_fpmath.cpp

@@ -33,7 +33,11 @@
 
 #include "procs.h"
 
-static const char *fp_kernel_code = R"(
+extern cl_half_rounding_mode halfRoundingMode;
+
+namespace {
+
+const char *fp_kernel_code = R"(
 %s
 __kernel void test_fp(__global TYPE *srcA, __global TYPE *srcB, __global TYPE *dst)
 {
@@ -42,8 +46,6 @@ __kernel void test_fp(__global TYPE *srcA, __global TYPE *srcB, __global TYPE *d
     dst[tid] = srcA[tid] OP srcB[tid];
 })";
 
-extern cl_half_rounding_mode halfRoundingMode;
-
 #define HFF(num) cl_half_from_float(num, halfRoundingMode)
 #define HTF(num) cl_half_to_float(num)
 
@@ -370,6 +372,8 @@ struct TypesIterator
     std::map<size_t, std::string> type2name;
 };
 
+} // anonymous namespace
+
 int test_fpmath(cl_device_id device, cl_context context, cl_command_queue queue,
                 int num_elements)
 {