[llvm-branch-commits] [openmp] r322837 - Merging r322830:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Jan 18 03:19:22 2018
New Revision: 322837

URL: http://llvm.org/viewvc/llvm-project?rev=322837&view=rev
Log:
Merging r322830:
------------------------------------------------------------------------
r322830 | hahnfeld | 2018-01-18 02:58:43 -0800 (Thu, 18 Jan 2018) | 1 line

Add missing headers for Debug builds
------------------------------------------------------------------------

Modified:
    openmp/branches/release_60/   (props changed)
    openmp/branches/release_60/libomptarget/src/rtl.cpp
    openmp/branches/release_60/libomptarget/src/rtl.h

Propchange: openmp/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 18 03:19:22 2018
@@ -1 +1 @@
-/openmp/trunk:321964,322068,322160
+/openmp/trunk:321964,322068,322160,322830

Modified: openmp/branches/release_60/libomptarget/src/rtl.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_60/libomptarget/src/rtl.cpp?rev=322837&r1=322836&r2=322837&view=diff
==============================================================================
--- openmp/branches/release_60/libomptarget/src/rtl.cpp (original)
+++ openmp/branches/release_60/libomptarget/src/rtl.cpp Thu Jan 18 03:19:22 2018
@@ -19,6 +19,7 @@
 #include <cstring>
 #include <dlfcn.h>
 #include <mutex>
+#include <string>
 
 // List of all plugins that can support offloading.
 static const char *RTLNames[] = {

Modified: openmp/branches/release_60/libomptarget/src/rtl.h
URL: http://llvm.org/viewvc/llvm-project/openmp/branches/release_60/libomptarget/src/rtl.h?rev=322837&r1=322836&r2=322837&view=diff
==============================================================================
--- openmp/branches/release_60/libomptarget/src/rtl.h (original)
+++ openmp/branches/release_60/libomptarget/src/rtl.h Thu Jan 18 03:19:22 2018
@@ -17,6 +17,7 @@
 #include <list>
 #include <map>
 #include <mutex>
+#include <string>
 #include <vector>
 
 // Forward declarations.