Manually resolve two rebase conflicts.

2020-09-11 07:39:46 -06:00
parent 50b80e078d
commit 9a5d8fd18b
1217 changed files with 8531 additions and 8531 deletions
--- a/lib/kokkos/core/unit_test/TestCTestDevice.cpp
+++ b/lib/kokkos/core/unit_test/TestCTestDevice.cpp
@ -13,7 +13,7 @@ int setenv(const char *name, const char *value, int overwrite) {
  int errcode = 0;
  if (!overwrite) {
    size_t envsize = 0;
-    errcode        = getenv_s(&envsize, NULL, 0, name);
+    errcode        = getenv_s(&envsize, nullptr, 0, name);
    if (errcode || envsize) return errcode;
  }
  return _putenv_s(name, value);