P4 to Git Change 1398063 by lmoriche@lmoriche_opencl_dev2 on 2017/04/13 12:12:33

SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
	- Make it possible to build with libstdc++

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/memfile.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.cpp#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#63 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#22 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.cpp#126 edit
... //depot/stg/opencl/drivers/opencl/runtime/thread/semaphore.cpp#9 edit

rocclr/runtime/device/rocm/rocprogram.cpp

@@ -29,6 +29,7 @@
 #include <sstream>
 #include <iostream>
 #include <istream>
+#include <iterator>
 
 namespace roc {
 
@@ -479,7 +480,7 @@ HSAILProgram::linkImpl_LC(
     bool createLibrary)
 {
     using namespace amd::opencl_driver;
-    std::auto_ptr<Compiler> C(newCompilerInstance());
+    std::unique_ptr<Compiler> C(newCompilerInstance());
 
     std::vector<Data*> inputs;
     for (auto program : (const std::vector<HSAILProgram*>&)inputPrograms) {
@@ -681,7 +682,7 @@ bool
 HSAILProgram::linkImpl_LC(amd::option::Options *options)
 {
     using namespace amd::opencl_driver;
-    std::auto_ptr<Compiler> C(newCompilerInstance());
+    std::unique_ptr<Compiler> C(newCompilerInstance());
 
     // call LinkLLVMBitcode
     std::vector<Data*> inputs;