Fix oversight in selection mechanism which led to erroneous code to be compiled for the grid_launch_GGL component.

[ROCm/hip commit: faa546d194]
2017-11-29 01:37:52 +00:00
parent dd8a589893
commit b996310710
4 changed files with 4 additions and 5 deletions
@@ -20,7 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#include "hip/hcc_detail/grid_launch_GGL.hpp"
 #include "hip/hcc_detail/program_state.hpp"

 #include "hip/hip_runtime_api.h"
@@ -20,7 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#if defined(FUNCTIONAL_GRID_LAUNCH)
+#include "hip/hcc_detail/grid_launch_GGL.hpp"
+
+#if !defined(FUNCTIONAL_GRID_LAUNCH)
    #include "functional_grid_launch.inl"
 #else
    #include "macro_based_grid_launch.inl"
@@ -20,8 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */

-#include "hip/hcc_detail/grid_launch_GGL.hpp"
-
 // Internal header, do not percolate upwards.
 #include "hip_hcc_internal.h"
 #include "hc.hpp"