summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-preprocessor.cpp
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2024-10-16 00:38:39 +0800
committerGitHub <noreply@github.com>2024-10-15 09:38:39 -0700
commit66b103180e168c597f3c246c68a9886b69707493 (patch)
tree1cf67b897d9e9fe897108a92fa8bb312a5de9f4e /source/slang/slang-preprocessor.cpp
parent9e3b0367cfd63f21a0519b61b6fd13e94dac1c51 (diff)
Move C interface from slang.h to slang-deprecated.h (#5301)
* Squash redundant move warnings * Move C interface from slang.h to slang-deprecated.h spGetBuildTagString remains, because it's useful to have before the global session exists. This C API is used quite pervasively in the C++ helpers (for example slang::UserAttribute. It's not trivial to move these to slang-deprecated.h as they're entangled with some enums which are themselves used elsewhere in the compiler. The fact that these helpers use the C API can be viewed as an implementation detail for now, and this usage moved to slang-deprecated in due course. Closes https://github.com/shader-slang/slang/issues/4758 * Squash warnings for our usage of our deprecated API --------- Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'source/slang/slang-preprocessor.cpp')
-rw-r--r--source/slang/slang-preprocessor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/slang/slang-preprocessor.cpp b/source/slang/slang-preprocessor.cpp
index c4a2bd95e..600e28bc5 100644
--- a/source/slang/slang-preprocessor.cpp
+++ b/source/slang/slang-preprocessor.cpp
@@ -3487,7 +3487,7 @@ static String _readDirectiveMessage(PreprocessorDirectiveContext* context)
result.append(token.getContent());
}
- return std::move(result);
+ return result;
}
// Handle a `#warning` directive