From f848e9f11724d36dc3c0565ab4c650a843f6da3e Mon Sep 17 00:00:00 2001
From: pensun <Peng.Sun@amd.com>
Date: Mon, 22 May 2017 08:52:43 -0500
Subject: [PATCH] fix GGL helper header file, reorder for C++17

Change-Id: I3d9ddfe670bf7e3e8e7bd85e52cc61f48c19c213


[ROCm/clr commit: 2523f8a492fc6f247b12330757f2432818414b0e]
---
 projects/clr/hipamd/include/hip/hcc_detail/helpers.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/clr/hipamd/include/hip/hcc_detail/helpers.hpp b/projects/clr/hipamd/include/hip/hcc_detail/helpers.hpp
index 611929766b..b5502c1efb 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/helpers.hpp
+++ b/projects/clr/hipamd/include/hip/hcc_detail/helpers.hpp
@@ -102,9 +102,6 @@ namespace hip_impl
         // Not callable.
         template<FunctionalProcedure F>
         struct is_callable_impl<F, 5u> : std::false_type {};
-
-        template<typename Call>
-        struct is_callable : is_callable_impl<Call> {};
     #else
         template<typename, typename = void>
         struct is_callable_impl : std::false_type {};
@@ -114,6 +111,8 @@ namespace hip_impl
             F(Ts...),
             void_t_<std::result_of_t<F(Ts...)>>> : std::true_type {};
     #endif
+        template<typename Call>
+        struct is_callable : is_callable_impl<Call> {};
 
     #define count_macro_args_impl_hip_(\
          _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15,\