P4 to Git Change 1185139 by fdaniil@spb_fdaniil_amd_hsa_brigvar_test on 2015/08/27 08:31:20

ECR #304775 - prepare to build with MSVC 18, part 3:
	changes in runtime/ugl

	testing done: smoke, precheckin
	reviewers: German Andryeyev, Bart Crane

	http://ocltc.amd.com/reviews/r/8338/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpucommand.cpp#65 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#274 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpumapping.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpumapping.hpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpuvirtual.cpp#25 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#183 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.cpp#116 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#521 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#295 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprintf.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#204 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#375 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.cpp#93 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsakernel.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsakernel.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/os/os_posix.cpp#40 edit
... //depot/stg/opencl/drivers/opencl/runtime/os/os_win32.cpp#45 edit

rocclr/runtime/device/cpu/cpucommand.cpp

@@ -17,6 +17,7 @@
 #include "utils/options.hpp"
 
 #include <amdocl/cl_kernel.h>
+#include <algorithm>
 
 namespace cpu {
 

rocclr/runtime/device/cpu/cpudevice.cpp

@@ -12,6 +12,8 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
+#include <algorithm>
+
 #if defined(__linux__)
 #if !defined(ATI_ARCH_ARM)
 #include <sys/sysinfo.h>

rocclr/runtime/device/cpu/cpumapping.cpp

@@ -11,6 +11,8 @@
 #include <functional>
 #include <string>
 #include <iostream>
+#include <algorithm>
+
 #if defined(_WIN32)
 #include <windows.h>
 #endif

rocclr/runtime/device/cpu/cpumapping.hpp

@@ -7,9 +7,6 @@
 #ifndef CPUMAPPING_HPP_
 #define CPUMAPPING_HPP_
 
-using std::min;
-using std::max;
-
 namespace cpu {
 
 class HCtoDCmap

rocclr/runtime/device/cpu/cpuvirtual.cpp

@@ -11,6 +11,7 @@
 #include "platform/memory.hpp"
 #include "platform/sampler.hpp"
 #include "os/os.hpp"
+#include <algorithm>
 
 namespace cpu {
 

rocclr/runtime/device/device.cpp

@@ -42,6 +42,7 @@ extern void DeviceUnload();
 #include <sstream>
 #include <fstream>
 #include <set>
+#include <algorithm>
 
 
 

rocclr/runtime/device/gpu/gpublit.cpp

@@ -8,6 +8,7 @@
 #include "device/gpu/gpumemory.hpp"
 #include "device/gpu/gpuvirtual.hpp"
 #include "utils/debug.hpp"
+#include <algorithm>
 
 namespace gpu {
 

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -37,6 +37,7 @@
 #include <sstream>
 #include <iostream>
 #include <ctype.h>
+#include <algorithm>
 
 #include "gpudebugmanager.hpp"
 

rocclr/runtime/device/gpu/gpukernel.cpp

@@ -20,6 +20,7 @@
 #include <sstream>
 #include <iostream>
 #include <ctime>
+#include <algorithm>
 
 namespace gpu {
 

rocclr/runtime/device/gpu/gpuprintf.cpp

@@ -11,6 +11,7 @@
 #include "device/gpu/gpuprogram.hpp"
 #include "device/gpu/gpuprintf.hpp"
 #include <cstdio>
+#include <algorithm>
 #include <math.h>
 
 namespace gpu {

rocclr/runtime/device/gpu/gpuprogram.cpp

@@ -14,6 +14,7 @@
 #include <fstream>
 #include <sstream>
 #include <cstdio>
+#include <algorithm>
 #include "utils/options.hpp"
 #include "hsa.h"
 #include "hsa_ext_image.h"

rocclr/runtime/device/gpu/gpuvirtual.cpp

@@ -21,6 +21,7 @@
 #include "amd_hsa_queue.h"
 #include <fstream>
 #include <sstream>
+#include <algorithm>
 
 #ifdef _WIN32
 #include <d3d10_1.h>

rocclr/runtime/device/hsa/hsadevice.cpp

@@ -44,6 +44,7 @@
 #include <sstream>
 #include <iostream>
 #include <vector>
+#include <algorithm>
 #endif  // WITHOUT_FSA_BACKEND
 
 const HsaCoreApiTable *hsacoreapi = NULL;

rocclr/runtime/device/hsa/hsakernel.cpp

@@ -6,6 +6,8 @@
 
 #include "device/hsa/oclhsa_common.hpp"
 
+#include <algorithm>
+
 #ifndef WITHOUT_FSA_BACKEND
 
 namespace oclhsa {

rocclr/runtime/os/os_posix.cpp

@@ -41,6 +41,7 @@
 #include <cstdio> // for tempnam
 #include <limits.h>
 #include <memory>
+#include <algorithm>
 
 
 

rocclr/runtime/os/os_win32.cpp

@@ -17,6 +17,7 @@
 #include <string>
 #include <sstream>
 #include <cstdlib>
+#include <algorithm>
 
 #ifndef WINAPI
 #define WINAPI