Use C++ headers instead of C headers (#1179)

Remove some unnecessary includes.

Signed-off-by: Marco Antognini <marco.antognini@arm.com>

test_conformance/math_brute_force/binary_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 const double twoToMinus1022 = MAKE_HEX_DOUBLE(0x1p-1022, 1, -1022);
 

test_conformance/math_brute_force/binary_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 const float twoToMinus126 = MAKE_HEX_FLOAT(0x1p-126f, 1, -126);
 

test_conformance/math_brute_force/binary_i_double.cpp

@@ -18,8 +18,8 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <limits.h>
+#include <climits>
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize,
                              cl_uint kernel_count, cl_kernel *k, cl_program *p,

test_conformance/math_brute_force/binary_i_float.cpp

@@ -18,8 +18,8 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <limits.h>
+#include <climits>
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_uint kernel_count,
                        cl_kernel *k, cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/binary_operator_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, const char *operator_symbol,
                              int vectorSize, cl_uint kernel_count, cl_kernel *k,

test_conformance/math_brute_force/binary_operator_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, const char *operator_symbol,
                        int vectorSize, cl_uint kernel_count, cl_kernel *k,

test_conformance/math_brute_force/binary_two_results_i_double.cpp

@@ -18,8 +18,8 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <limits.h>
+#include <climits>
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize, cl_kernel *k,
                              cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/binary_two_results_i_float.cpp

@@ -18,8 +18,8 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <limits.h>
+#include <climits>
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_kernel *k,
                        cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/i_unary_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize, cl_kernel *k,
                              cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/i_unary_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_kernel *k,
                        cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/macro_binary_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize,
                              cl_uint kernel_count, cl_kernel *k, cl_program *p,

test_conformance/math_brute_force/macro_binary_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_uint kernel_count,
                        cl_kernel *k, cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/macro_unary_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize,
                              cl_uint kernel_count, cl_kernel *k, cl_program *p,

test_conformance/math_brute_force/macro_unary_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_uint kernel_count,
                        cl_kernel *k, cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/mad_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize, cl_kernel *k,
                              cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/mad_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_kernel *k,
                        cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/main.cpp

@@ -20,8 +20,8 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <ctime>
 #include <string>
-#include <time.h>
 
 #include "harness/errorHelpers.h"
 #include "harness/kernelHelpers.h"

test_conformance/math_brute_force/reference_math.cpp

@@ -14,12 +14,13 @@
 // limitations under the License.
 //
 
-#include "harness/compat.h"
 #include "reference_math.h"
-#include <limits.h>
+#include "harness/compat.h"
+
+#include <climits>
 
 #if !defined(_WIN32)
-#include <string.h>
+#include <cstring>
 #endif
 
 #include "utility.h"

test_conformance/math_brute_force/ternary_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 #define CORRECTLY_ROUNDED 0
 #define FLUSHED 1

test_conformance/math_brute_force/ternary_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 #define CORRECTLY_ROUNDED 0
 #define FLUSHED 1

test_conformance/math_brute_force/unary_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 #if defined(__APPLE__)
 #include <sys/time.h>

test_conformance/math_brute_force/unary_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 #if defined(__APPLE__)
 #include <sys/time.h>

test_conformance/math_brute_force/unary_two_results_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize, cl_kernel *k,
                              cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/unary_two_results_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_kernel *k,
                        cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/unary_two_results_i_double.cpp

@@ -18,8 +18,8 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <limits.h>
+#include <climits>
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize, cl_kernel *k,
                              cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/unary_two_results_i_float.cpp

@@ -18,8 +18,8 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <limits.h>
+#include <climits>
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_kernel *k,
                        cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/unary_u_double.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernelDouble(const char *name, int vectorSize, cl_kernel *k,
                              cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/unary_u_float.cpp

@@ -18,7 +18,7 @@
 #include "test_functions.h"
 #include "utility.h"
 
-#include <string.h>
+#include <cstring>
 
 static int BuildKernel(const char *name, int vectorSize, cl_kernel *k,
                        cl_program *p, bool relaxedMode)

test_conformance/math_brute_force/utility.h

@@ -17,13 +17,6 @@
 #define UTILITY_H
 
 #include "harness/compat.h"
-
-#ifdef __APPLE__
-#include <OpenCL/opencl.h>
-#else
-#include <CL/opencl.h>
-#endif
-#include <stdio.h>
 #include "harness/rounding_mode.h"
 #include "harness/fpcontrol.h"
 #include "harness/testHarness.h"