P4 to Git Change 1402826 by lmoriche@lmoriche_opencl_dev2 on 2017/04/26 12:05:30

SWDEV-102726 - [OCL-LC-ROCm] Open source OpenCL Runtime
	- Cleanups to build with gcc 5.4 and cmake.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/elf.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/elf.hpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/blit.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#23 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#17 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprintf.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#65 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#36 edit


[ROCm/clr commit: d2ca5e309d]

projects/clr/rocclr/runtime/device/rocm/rocprintf.cpp

@@ -13,7 +13,7 @@
 #include "device/rocm/rocprintf.hpp"
 #include <cstdio>
 #include <algorithm>
-#include <math.h>
+#include <cmath>
 
 namespace roc {
 
@@ -165,13 +165,13 @@ size_t PrintfDbg::outputArgument(const std::string& fmt, bool printFloat, size_t
           }
           float fArg = *(reinterpret_cast<const float*>(argument));
           float fSign = copysign(1.0, fArg);
-          if (isinf(fArg) && !isnan(fArg)) {
+          if (std::isinf(fArg) && !std::isnan(fArg)) {
             if (fSign < 0) {
               amd::Os::printf(fmtF.data(), "-infinity");
             } else {
               amd::Os::printf(fmtF.data(), "infinity");
             }
-          } else if (isnan(fArg)) {
+          } else if (std::isnan(fArg)) {
             if (fSign < 0) {
               amd::Os::printf(fmtF.data(), "-nan");
             } else {