From e66a75ea552cc70c8626243afda9858e7930c1ae Mon Sep 17 00:00:00 2001
From: Alex Voicu <alexandru.voicu@amd.com>
Date: Thu, 18 Oct 2018 12:29:27 +0100
Subject: [PATCH] Guard new includes.

---
 samples/0_Intro/hcc_dialects/vadd_hc_am.cpp        | 9 +++++++--
 samples/0_Intro/hcc_dialects/vadd_hc_array.cpp     | 6 +++++-
 samples/0_Intro/hcc_dialects/vadd_hc_array.hc      | 6 +++++-
 samples/0_Intro/hcc_dialects/vadd_hc_arrayview.cpp | 6 +++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/samples/0_Intro/hcc_dialects/vadd_hc_am.cpp b/samples/0_Intro/hcc_dialects/vadd_hc_am.cpp
index 9cfad779f9..47fd46cc40 100644
--- a/samples/0_Intro/hcc_dialects/vadd_hc_am.cpp
+++ b/samples/0_Intro/hcc_dialects/vadd_hc_am.cpp
@@ -26,8 +26,13 @@ THE SOFTWARE.
 // which can only be used on the device.  The programmer has full control
 // over when data is copied.
 
-#include <hc/hc.hpp>
-#include <hc/hc_am.hpp>
+#if defined(HC_NEXT)
+    #include <hc/hc.hpp>
+    #include <hc/hc_am.hpp>
+#else
+    #include <hc.hpp>
+    #include <hc_am.hpp>
+#endif
 
 int main(int argc, char* argv[]) {
     int sizeElements = 1000000;
diff --git a/samples/0_Intro/hcc_dialects/vadd_hc_array.cpp b/samples/0_Intro/hcc_dialects/vadd_hc_array.cpp
index aff64528aa..3599eb07db 100644
--- a/samples/0_Intro/hcc_dialects/vadd_hc_array.cpp
+++ b/samples/0_Intro/hcc_dialects/vadd_hc_array.cpp
@@ -27,7 +27,11 @@ THE SOFTWARE.
 // automatic data management capabilities - instead the programmer
 // takes the reins and controls when copies are executed.
 
-#include <hc/hc.hpp>
+#if defined(HC_NEXT)
+    #include <hc/hc.hpp>
+#else
+    #include <hc.hpp>
+#endif
 
 int main(int argc, char* argv[]) {
     int sizeElements = 1000000;
diff --git a/samples/0_Intro/hcc_dialects/vadd_hc_array.hc b/samples/0_Intro/hcc_dialects/vadd_hc_array.hc
index cd3d32fd4c..605d11f999 100644
--- a/samples/0_Intro/hcc_dialects/vadd_hc_array.hc
+++ b/samples/0_Intro/hcc_dialects/vadd_hc_array.hc
@@ -20,7 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include <hc/hc.hpp>
+#if defined(HC_NEXT)
+    #include <hc/hc.hpp>
+#else
+    #include <hc.hpp>
+#endif
 
 int main(int argc, char *argv[])
 {
diff --git a/samples/0_Intro/hcc_dialects/vadd_hc_arrayview.cpp b/samples/0_Intro/hcc_dialects/vadd_hc_arrayview.cpp
index 2d2089abc7..46ac8427a7 100644
--- a/samples/0_Intro/hcc_dialects/vadd_hc_arrayview.cpp
+++ b/samples/0_Intro/hcc_dialects/vadd_hc_arrayview.cpp
@@ -33,7 +33,11 @@ THE SOFTWARE.
 // implicit data transfer is used - really the only difference is the namespace.
 // Other examples show some of the more advanced controls.
 
-#include <hc/hc.hpp>
+#if defined(HC_NEXT)
+    #include <hc/hc.hpp>
+#else
+    #include <hc.hpp>
+#endif
 
 int main(int argc, char* argv[]) {
     int sizeElements = 1000000;