Merge pull request #103 from LLNL/faster-compile

trws · web-flow · commit 3c12c0c98649 · 2022-02-24T16:26:29.000-08:00
open up extra return
diff --git a/include/camp/resource/cuda.hpp b/include/camp/resource/cuda.hpp
@@ -124,11 +124,10 @@ namespace resources
           }
         }
         ::camp::throw_re("invalid pointer detected");
-        #if defined(__CUDACC__) && defined(__CUDA_ARCH__)
-        // This return statement exists because nvcc is annoying
+        // This return statement exists because compilers do not determine the
+        // above unconditionally throws
         // related: https://stackoverflow.com/questions/64523302/cuda-missing-return-statement-at-end-of-non-void-function-in-constexpr-if-fun
         return MemoryAccess::Unknown;
-        #endif
       }
     public:
       Cuda(int group = -1, int dev = 0)

Original file line number	Diff line number	Diff line change
`@@ -124,11 +124,10 @@ namespace resources`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`::camp::throw_re("invalid pointer detected");`
`127`		`- #if defined(__CUDACC__) && defined(__CUDA_ARCH__)`
`128`		`- // This return statement exists because nvcc is annoying`
	`127`	`+ // This return statement exists because compilers do not determine the`
	`128`	`+ // above unconditionally throws`
`129`	`129`	`// related: https://stackoverflow.com/questions/64523302/cuda-missing-return-statement-at-end-of-non-void-function-in-constexpr-if-fun`
`130`	`130`	`return MemoryAccess::Unknown;`
`131`		`- #endif`
`132`	`131`	`}`
`133`	`132`	`public:`
`134`	`133`	`Cuda(int group = -1, int dev = 0)`