Skip to content

Commit f187b90

Browse files
SineStrikerSineStriker
committed
Migrate to new stdcorelib
1 parent 97fdc4b commit f187b90

51 files changed

Lines changed: 157 additions & 157 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎domains/ds-bank/lib/PackageListConfig.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace ds::bank {
3232
return false;
3333
}
3434
auto versionStr = token.substr(openBracket + 1, token.size() - openBracket - 2);
35-
version = stdc::VersionNumber::fromString(versionStr);
35+
version = stdc::VersionNumber::fromString(versionStr).value_or(stdc::VersionNumber());
3636
return !version.isEmpty();
3737
}
3838

‎domains/ds-bank/lib/PackageParser.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ namespace ds::bank {
125125

126126
auto g2pPackageVersion = stringField(obj, "g2pPackageVersion");
127127
if (!g2pPackageVersion.empty()) {
128-
lang.setG2pPackageVersion(stdc::VersionNumber::fromString(g2pPackageVersion));
128+
lang.setG2pPackageVersion(stdc::VersionNumber::fromString(g2pPackageVersion).value_or(stdc::VersionNumber()));
129129
}
130130

131131
lang.setDict(resolvePath(packageRoot, basePath, stringField(obj, "dict"), err,
@@ -440,7 +440,7 @@ namespace ds::bank {
440440
{
441441
auto it = obj.find("version");
442442
if (it != obj.end() && it->second.isString()) {
443-
info.setVersion(stdc::VersionNumber::fromString(it->second.toString()));
443+
info.setVersion(stdc::VersionNumber::fromString(it->second.toString()).value_or(stdc::VersionNumber()));
444444
} else {
445445
return Error::packageError(
446446
srt::core::ErrorCode::PackageManifestMissingField,
@@ -454,7 +454,7 @@ namespace ds::bank {
454454
{
455455
auto it = obj.find("compatVersion");
456456
if (it != obj.end() && it->second.isString()) {
457-
info.setCompatVersion(stdc::VersionNumber::fromString(it->second.toString()));
457+
info.setCompatVersion(stdc::VersionNumber::fromString(it->second.toString()).value_or(stdc::VersionNumber()));
458458
}
459459
}
460460

‎domains/ds-bank/lib/VoicebankScanner.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ namespace ds::bank {
4545
if (stored == query) {
4646
return true;
4747
}
48-
const auto storedVN = stdc::VersionNumber::fromString(stored);
49-
const auto queryVN = stdc::VersionNumber::fromString(query);
48+
const auto storedVN = stdc::VersionNumber::fromString(stored).value_or(stdc::VersionNumber());
49+
const auto queryVN = stdc::VersionNumber::fromString(query).value_or(stdc::VersionNumber());
5050
return storedVN == queryVN;
5151
}
5252

‎domains/ds-bank/unittests/tst_g2p_route.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ TEST_CASE("G2pInput default construction has empty fields", "[g2p][route][input]
145145
}
146146

147147
TEST_CASE("G2pInput full construction propagates all fields", "[g2p][route][input]") {
148-
auto version = stdc::VersionNumber::fromString("2.1.0");
148+
auto version = stdc::VersionNumber::fromString("2.1.0").value();
149149
G2pInput input("hello", "g2p-en-official", "my_singer", version);
150150
REQUIRE(input.lyric == "hello");
151151
REQUIRE(input.g2pId == "g2p-en-official");
@@ -241,7 +241,7 @@ TEST_CASE("G2pRes g2pSource defaults to empty", "[g2p][route][res]") {
241241
}
242242

243243
TEST_CASE("G2pRes g2pSource set to voicebank in full constructor", "[g2p][route][res]") {
244-
auto version = stdc::VersionNumber::fromString("1.0");
244+
auto version = stdc::VersionNumber::fromString("1.0").value();
245245
G2pRes res("test", "g2p-x", "my_singer", version, "t eh s t",
246246
{}, kG2pModeConvert, NoError, kG2pSourceVoicebank);
247247
REQUIRE(res.g2pSource == kG2pSourceVoicebank);

‎domains/ds-bank/unittests/tst_package_list_config.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ TEST_CASE("PackageListConfig round-trip preserves all fields", "[ds-bank][list-c
8383
// 构造一个包含两条记录的配置
8484
std::vector<PackageListItem> items;
8585
items.emplace_back(
86-
PackageListItem{"pkg.a", stdc::VersionNumber::fromString("1.0.0"),
86+
PackageListItem{"pkg.a", stdc::VersionNumber::fromString("1.0.0").value(),
8787
std::filesystem::path("pkg_a/pkg.a"),
8888
PackageListItemMetadata{true, 1700000000}});
8989
items.emplace_back(
90-
PackageListItem{"pkg.b", stdc::VersionNumber::fromString("2.5.1"),
90+
PackageListItem{"pkg.b", stdc::VersionNumber::fromString("2.5.1").value(),
9191
std::filesystem::path("pkg_b/pkg.b"),
9292
PackageListItemMetadata{false, 0}});
9393

@@ -292,7 +292,7 @@ TEST_CASE("PackageListConfig preserves insertion order across save/load",
292292
const std::vector<std::string> ids = {"zeta", "alpha", "middle", "beta"};
293293
for (const auto &id : ids) {
294294
items.emplace_back(PackageListItem{
295-
id, stdc::VersionNumber::fromString("1.0.0"),
295+
id, stdc::VersionNumber::fromString("1.0.0").value(),
296296
std::filesystem::path(id + "/"),
297297
PackageListItemMetadata{true, 0}});
298298
}

‎domains/ds-bank/unittests/tst_package_validator_manifest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace {
3232
PackageManifest info;
3333
info.setPackageId("pkg.complete");
3434
info.setName("Complete Package");
35-
info.setVersion(stdc::VersionNumber::fromString("1.0.0"));
35+
info.setVersion(stdc::VersionNumber::fromString("1.0.0").value());
3636

3737
SingerManifest singer;
3838
singer.setSingerId("singer_a");
@@ -139,7 +139,7 @@ TEST_CASE("PackageValidator validate reports all singers when none have singerId
139139
PackageManifest info;
140140
info.setPackageId("pkg.empty-singers");
141141
info.setName("Empty Singers");
142-
info.setVersion(stdc::VersionNumber::fromString("1.0.0"));
142+
info.setVersion(stdc::VersionNumber::fromString("1.0.0").value());
143143

144144
// 添加 3 个空 singerId 的 singer
145145
std::vector<SingerManifest> singers;

‎domains/ds-bank/unittests/tst_voicebank_g2p_integration.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ TEST_CASE("Integration: G2pRes skip mode for empty lyric", "[integration][g2p-re
582582

583583
TEST_CASE("Integration: G2pRes failure with voicebank source", "[integration][g2p-res]") {
584584
// Simulate a voicebank G2P that failed.
585-
auto version = stdc::VersionNumber::fromString("1.0");
585+
auto version = stdc::VersionNumber::fromString("1.0").value();
586586
G2pRes res("unknown_word", "g2p-cmn-custom", "singer_vb", version,
587587
"unknown_word", {}, kG2pModeCopy, ModelInferenceFailed, kG2pSourceVoicebank);
588588
REQUIRE(res.isFailed());

‎domains/ds-bank/unittests/tst_voicebank_scanner_package_dirs.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ TEST_CASE("VoicebankScanner packageDirectories returns all versions",
9090
const std::string packageId = "pkgdirs.multiver";
9191
const auto pkgDir1 = root / "pkg_v1";
9292
const auto pkgDir2 = root / "pkg_v2";
93-
const auto v1 = stdc::VersionNumber::fromString("1.0.0");
94-
const auto v2 = stdc::VersionNumber::fromString("2.0.0");
93+
const auto v1 = stdc::VersionNumber::fromString("1.0.0").value();
94+
const auto v2 = stdc::VersionNumber::fromString("2.0.0").value();
9595

9696
createPackage(pkgDir1, packageId, "1.0.0");
9797
createPackage(pkgDir2, packageId, "2.0.0");
@@ -156,7 +156,7 @@ TEST_CASE("VoicebankScanner packageDirectories dedups same version",
156156
const auto root1 = makeTempDir("dedup-1");
157157
const auto root2 = makeTempDir("dedup-2");
158158
const std::string packageId = "pkgdirs.dedup";
159-
const auto v1 = stdc::VersionNumber::fromString("1.0.0");
159+
const auto v1 = stdc::VersionNumber::fromString("1.0.0").value();
160160

161161
// Same packageId+version in two search paths. The second refresh
162162
// overwrites the first's path (matches legacy overwrite-on-same-packageId

‎domains/ds-infer/lib/SingerStageResolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ namespace ds::infer {
162162
stdc::VersionNumber requestedVersion;
163163
if (!version.empty()) {
164164
try {
165-
requestedVersion = stdc::VersionNumber::fromString(version);
165+
requestedVersion = stdc::VersionNumber::fromString(version).value_or(stdc::VersionNumber());
166166
} catch (const std::exception &e) {
167167
// BUG-13: 第三方异常边界隔离（ROBUST-02）。fromString 是第三方接口，
168168
// 非法 version 字符串可能抛 std::exception，必须在此边界转换为 Error，

‎domains/ds-infer/lib/util/inferutil/include/inferutil/TensorHelper.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace ds::infer::inferutil {
2222
}
2323
helper.m_tensor = exp.take();
2424
auto dataPtr = helper.m_tensor->template mutableData<T>();
25-
if (STDCORELIB_UNLIKELY(dataPtr == nullptr)) {
25+
if (STDC_UNLIKELY(dataPtr == nullptr)) {
2626
return srt::core::Error(srt::core::Error::SessionError, "failed to create tensor");
2727
}
2828
helper.m_current = dataPtr;
@@ -54,7 +54,7 @@ namespace ds::infer::inferutil {
5454
return std::move(m_tensor);
5555
}
5656

57-
STDCORELIB_DISABLE_COPY(TensorHelper)
57+
STDC_DISABLE_COPY(TensorHelper)
5858

5959
TensorHelper(TensorHelper &&other) noexcept
6060
: m_tensor(std::move(other.m_tensor)), m_current(other.m_current), m_end(other.m_end) {

0 commit comments

Comments
 (0)