summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/compiler-core/slang-artifact-desc-util.cpp2
-rw-r--r--source/compiler-core/slang-source-embed-util.cpp2
-rw-r--r--source/core/slang-common.h22
-rw-r--r--source/core/slang-persistent-cache.cpp2
-rw-r--r--source/core/slang-string-util.cpp4
-rw-r--r--source/slang-record-replay/record/slang-global-session.cpp2
-rw-r--r--source/slang-record-replay/replay/replay-consumer.cpp2
-rw-r--r--source/slang/slang-api.cpp2
-rw-r--r--source/slang/slang-ast-val.cpp2
-rw-r--r--source/slang/slang-compiler.cpp2
-rw-r--r--source/slang/slang-ir.cpp2
-rw-r--r--source/slang/slang-mangle.cpp2
-rw-r--r--source/slang/slang-options.cpp2
-rw-r--r--source/slang/slang-preprocessor.cpp2
14 files changed, 40 insertions, 10 deletions
diff --git a/source/compiler-core/slang-artifact-desc-util.cpp b/source/compiler-core/slang-artifact-desc-util.cpp
index ae7f84227..57102182e 100644
--- a/source/compiler-core/slang-artifact-desc-util.cpp
+++ b/source/compiler-core/slang-artifact-desc-util.cpp
@@ -958,7 +958,7 @@ SlangResult ArtifactDescUtil::appendDefaultExtension(const ArtifactDesc& desc, S
{
StringBuilder buf;
appendText(desc, buf);
- return std::move(buf);
+ return buf;
}
} // namespace Slang
diff --git a/source/compiler-core/slang-source-embed-util.cpp b/source/compiler-core/slang-source-embed-util.cpp
index 45fd9c4b3..ec0c005cf 100644
--- a/source/compiler-core/slang-source-embed-util.cpp
+++ b/source/compiler-core/slang-source-embed-util.cpp
@@ -73,7 +73,7 @@ static bool _isHeaderExtension(const UnownedStringSlice& in)
// Assume it's a header, and just use the .h extension
StringBuilder buf;
buf << path << toSlice(".h");
- return std::move(buf);
+ return buf;
}
/* static */SourceEmbedUtil::Style SourceEmbedUtil::getDefaultStyle(const ArtifactDesc& desc)
diff --git a/source/core/slang-common.h b/source/core/slang-common.h
index 855ea08db..8c84894ca 100644
--- a/source/core/slang-common.h
+++ b/source/core/slang-common.h
@@ -181,6 +181,28 @@ public:
# define SLANG_EXHAUSTIVE_SWITCH_END
#endif
+#if SLANG_GCC
+# define SLANG_ALLOW_DEPRECATED_BEGIN \
+ _Pragma("GCC diagnostic push"); \
+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"");
+# define SLANG_ALLOW_DEPRECATED_END \
+ _Pragma("GCC diagnostic pop");
+#elif SLANG_CLANG
+# define SLANG_ALLOW_DEPRECATED_BEGIN \
+ _Pragma("clang diagnostic push"); \
+ _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"");
+# define SLANG_ALLOW_DEPRECATED_END \
+ _Pragma("clang diagnostic pop");
+#elif SLANG_VC
+# define SLANG_ALLOW_DEPRECATED_BEGIN \
+ _Pragma("warning(push)"); \
+ _Pragma("warning(disable : 4996)");
+# define SLANG_ALLOW_DEPRECATED_END \
+ _Pragma("warning(pop)");
+#else
+# define SLANG_ALLOW_DEPRECATED_BEGIN
+# define SLANG_ALLOW_DEPRECATED_END
+#endif
//
// Use `SLANG_ASSUME(myBoolExpression);` to inform the compiler that the condition is true.
diff --git a/source/core/slang-persistent-cache.cpp b/source/core/slang-persistent-cache.cpp
index d934d1b26..2b4113e16 100644
--- a/source/core/slang-persistent-cache.cpp
+++ b/source/core/slang-persistent-cache.cpp
@@ -226,7 +226,7 @@ String PersistentCache::getEntryFileName(const Key& key)
{
StringBuilder str;
str << m_cacheDirectory << "/" << key.toString();
- return std::move(str);
+ return str;
}
struct CacheIndexHeader
diff --git a/source/core/slang-string-util.cpp b/source/core/slang-string-util.cpp
index c7625e1e0..79f7307dc 100644
--- a/source/core/slang-string-util.cpp
+++ b/source/core/slang-string-util.cpp
@@ -332,7 +332,7 @@ UnownedStringSlice StringUtil::getAtInSplit(const UnownedStringSlice& in, char s
append(format, args, builder);
va_end(args);
- return std::move(builder);
+ return builder;
}
/* static */UnownedStringSlice StringUtil::getSlice(ISlangBlob* blob)
@@ -384,7 +384,7 @@ ComPtr<ISlangBlob> StringUtil::createStringBlob(const String& string)
}
builder.appendInPlace(dstChars, numChars);
- return std::move(builder);
+ return builder;
}
/* static */String StringUtil::calcCharReplaced(const String& string, char fromChar, char toChar)
diff --git a/source/slang-record-replay/record/slang-global-session.cpp b/source/slang-record-replay/record/slang-global-session.cpp
index e35b0ab76..012900f5c 100644
--- a/source/slang-record-replay/record/slang-global-session.cpp
+++ b/source/slang-record-replay/record/slang-global-session.cpp
@@ -236,7 +236,9 @@ namespace SlangRecord
recorder = m_recordManager->endMethodRecord();
}
+ SLANG_ALLOW_DEPRECATED_BEGIN
SlangResult res = m_actualGlobalSession->createCompileRequest(outCompileRequest);
+ SLANG_ALLOW_DEPRECATED_END
{
recorder->recordAddress(*outCompileRequest);
diff --git a/source/slang-record-replay/replay/replay-consumer.cpp b/source/slang-record-replay/replay/replay-consumer.cpp
index 6fb114c47..dd457c5d0 100644
--- a/source/slang-record-replay/replay/replay-consumer.cpp
+++ b/source/slang-record-replay/replay/replay-consumer.cpp
@@ -385,7 +385,9 @@ namespace SlangRecord
slang::IGlobalSession* globalSession = getObjectPointer<slang::IGlobalSession>(objectId);
slang::ICompileRequest* outRequest {};
+ SLANG_ALLOW_DEPRECATED_BEGIN
SlangResult res = globalSession->createCompileRequest(&outRequest);
+ SLANG_ALLOW_DEPRECATED_END
if (outRequest && SLANG_SUCCEEDED(res))
{
diff --git a/source/slang/slang-api.cpp b/source/slang/slang-api.cpp
index 412cec0d4..ccecc74e1 100644
--- a/source/slang/slang-api.cpp
+++ b/source/slang/slang-api.cpp
@@ -225,7 +225,9 @@ SLANG_API SlangCompileRequest* spCreateCompileRequest(
{
slang::ICompileRequest* request = nullptr;
// Will return with suitable ref count
+ SLANG_ALLOW_DEPRECATED_BEGIN
session->createCompileRequest(&request);
+ SLANG_ALLOW_DEPRECATED_END
return request;
}
diff --git a/source/slang/slang-ast-val.cpp b/source/slang/slang-ast-val.cpp
index 68a55e567..f30041175 100644
--- a/source/slang/slang-ast-val.cpp
+++ b/source/slang/slang-ast-val.cpp
@@ -120,7 +120,7 @@ String Val::toString()
{
StringBuilder builder;
toText(builder);
- return std::move(builder);
+ return builder;
}
HashCode Val::getHashCode()
diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp
index 5bbc92e97..af4468383 100644
--- a/source/slang/slang-compiler.cpp
+++ b/source/slang/slang-compiler.cpp
@@ -940,7 +940,7 @@ namespace Slang
{
builder << ";" << _getDisplayPath(sink, sourceFiles[i]);
}
- return std::move(builder);
+ return builder;
}
}
}
diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp
index f190b3a11..d0dcfd4fb 100644
--- a/source/slang/slang-ir.cpp
+++ b/source/slang/slang-ir.cpp
@@ -7684,7 +7684,7 @@ namespace Slang
{
StringBuilder sb;
printSlangIRAssembly(sb, module, options, sourceManager);
- return std::move(sb);
+ return sb;
}
void dumpIR(IRModule* module, const IRDumpOptions& options, SourceManager* sourceManager, ISlangWriter* writer)
diff --git a/source/slang/slang-mangle.cpp b/source/slang/slang-mangle.cpp
index 5a0d41f09..93b29ccbe 100644
--- a/source/slang/slang-mangle.cpp
+++ b/source/slang/slang-mangle.cpp
@@ -823,7 +823,7 @@ namespace Slang
builder << "_Sh";
builder.append(uint64_t(hash), 16);
- return std::move(builder);
+ return builder;
}
}
diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp
index 48c593889..43f98872d 100644
--- a/source/slang/slang-options.cpp
+++ b/source/slang/slang-options.cpp
@@ -1148,7 +1148,9 @@ SlangResult OptionsParser::_compileReproDirectory(SlangSession* session, EndToEn
{
// Create a fresh request
ComPtr<slang::ICompileRequest> request;
+ SLANG_ALLOW_DEPRECATED_BEGIN
SLANG_RETURN_ON_FAIL(session->createCompileRequest(request.writeRef()));
+ SLANG_ALLOW_DEPRECATED_END
auto requestImpl = asInternal(request);
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
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-05 03:31:23 +0000