fix "incompatible redefinition" warnings (#7894)

replace `#include <climits>` with `#include <cuda/std/climits>` to eliminate "incompatible redefinition" warnings. Also fixes a preprocessor typo. note: while it's safe to merge this PR prior to rapidsai/jitify#13, both are required to eliminate incompatible redefinition warnings. Authors: - Christopher Harris (https://github.com/cwharris) Approvers: - Nghia Truong (https://github.com/ttnghia) - Keith Kraus (https://github.com/kkraus14) - David Wendt (https://github.com/davidwendt) URL: #7894
rapidsai · Apr 7, 2021 · 2958719 · 2958719
1 parent a06d2dc
commit 2958719
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cpp/include/cudf/utilities/bit.hpp b/cpp/include/cudf/utilities/bit.hpp
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <cassert>
-#include <climits>
+#include <cuda/std/climits>
 #include <cudf/types.hpp>
 
 /**

diff --git a/cpp/src/jit/cache.cpp b/cpp/src/jit/cache.cpp
@@ -97,7 +97,7 @@ std::string get_program_cache_dir()
 {
 #if defined(JITIFY_USE_CACHE)
   return get_cache_dir().string();
-#elif
+#else
   return {};
 #endif
 }

diff --git a/cpp/tests/unary/math_ops_test.cpp b/cpp/tests/unary/math_ops_test.cpp
@@ -25,7 +25,7 @@
 #include <cudf_test/column_wrapper.hpp>
 #include <cudf_test/type_lists.hpp>
 
-#include <climits>
+#include <cuda/std/climits>
 #include <vector>
 
 template <typename T>
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,7 +97,7 @@ std::string get_program_cache_dir() @@
     {
     #if defined(JITIFY_USE_CACHE)
       return get_cache_dir().string();
-    #elif
+    #else
       return {};
     #endif
     }
@@ Expand Down @@