From 8f197606a2b925ecde068e35d4602917f6db2ae7 Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Tue, 27 Jul 2021 10:52:28 -0400 Subject: [PATCH] SWDEV-292547 - Fix Windows build This addresses the warning `not all control paths return a value`. Change-Id: Ibbb5eda9758dca5cc94c8efba9bbc6910362d6ba [ROCm/clr commit: a89d34d0c986baef18272ccae21ae8f12867b4bb] --- projects/clr/hipamd/src/hip_internal.hpp | 2 +- projects/clr/hipamd/src/hip_stream.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/src/hip_internal.hpp b/projects/clr/hipamd/src/hip_internal.hpp index 3ceb61d3a3..6fdded7ff5 100755 --- a/projects/clr/hipamd/src/hip_internal.hpp +++ b/projects/clr/hipamd/src/hip_internal.hpp @@ -348,7 +348,7 @@ extern int ihipGetDevice(); extern hipError_t ihipMalloc(void** ptr, size_t sizeBytes, unsigned int flags); extern amd::Memory* getMemoryObject(const void* ptr, size_t& offset); extern amd::Memory* getMemoryObjectWithOffset(const void* ptr, const size_t size); -extern hipError_t getStreamPerThread(hipStream_t& stream); +extern void getStreamPerThread(hipStream_t& stream); constexpr bool kOptionChangeable = true; constexpr bool kNewDevProg = false; diff --git a/projects/clr/hipamd/src/hip_stream.cpp b/projects/clr/hipamd/src/hip_stream.cpp index cbf3e27105..0c93cfc0e2 100755 --- a/projects/clr/hipamd/src/hip_stream.cpp +++ b/projects/clr/hipamd/src/hip_stream.cpp @@ -294,7 +294,7 @@ public: thread_local stream_per_thread streamPerThreadObj; // ================================================================================================ -hipError_t getStreamPerThread(hipStream_t& stream) { +void getStreamPerThread(hipStream_t& stream) { if (stream == hipStreamPerThread) { stream = streamPerThreadObj.get(); }