Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/extras
diff options
context:
space:
mode:
authorLeitwolf2026-11-15 22:58:40 +0300
committerGitHub2026-11-15 22:58:40 +0300
commit21ce423a12523559abf83f7a2ed83e042efc418d (patch)
treee83ae3454c5692f46c70876fb60fcc62828b2142 /extras
parent79f624d693b4fc3167c239c3eca47c858799333f (diff)
parent2fbb5585e35078cb2490c8ae988860aa6dc0399d (diff)
downloadcatch3-security/bounded-strings.tar.gz
Merge branch 'devel' into security/bounded-stringssecurity/bounded-strings
Diffstat (limited to 'extras')
-rw-r--r--extras/catch_amalgamated.cpp106
-rw-r--r--extras/catch_amalgamated.hpp6
-rw-r--r--extras/catch_amalgamated_third_party.hpp2
3 files changed, 57 insertions, 57 deletions
diff --git a/extras/catch_amalgamated.cpp b/extras/catch_amalgamated.cpp
index 3f98cd4a..a5dc580c 100644
--- a/extras/catch_amalgamated.cpp
+++ b/extras/catch_amalgamated.cpp
@@ -12,8 +12,8 @@
// You probably shouldn't edit it directly.
//
// The parts that come from src/Progmasoft, the Catch3 runner, keep
-// their own copyright and license lines (MPL-2.0 WITH
-// AdditionRef-Progmasoft-Exception-2.0). The runner needs C++17.
+// their own copyright and license lines (LGPL-3.0-or-later). The
+// runner needs C++17.
// ----------------------------------------------------------
#include "catch_amalgamated.hpp"
@@ -37,13 +37,13 @@
#endif // defined(CATCH_PLATFORM_WINDOWS)
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cassert>
#include <optional>
@@ -215,10 +215,10 @@ namespace Progmasoft::Catch3::Runner
const std::filesystem::path &right);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cstddef>
#include <cstdint>
@@ -507,7 +507,7 @@ namespace Progmasoft::Catch3
#include <vector>
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cstdint>
@@ -838,10 +838,10 @@ namespace Progmasoft::Catch3::Runner
const std::string &binaryName);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <chrono>
#include <cstddef>
@@ -947,7 +947,7 @@ namespace Progmasoft::Catch3::Runner
};
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <chrono>
@@ -1278,7 +1278,7 @@ namespace Progmasoft::Catch3::Runner
QuoteTestSpec(const std::string &name);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
@@ -1342,7 +1342,7 @@ namespace Progmasoft::Catch3::Runner
TraceJson(const RunResult &run);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cstdint>
#include <filesystem>
@@ -1418,7 +1418,7 @@ namespace Progmasoft::Catch3::Runner
std::size_t jobs);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <functional>
#include <memory>
@@ -1478,7 +1478,7 @@ namespace Progmasoft::Catch3::Runner
RunWorker(const Options &options, const std::string &programName);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <chrono>
@@ -1534,7 +1534,7 @@ namespace Progmasoft::Catch3::Runner
UniqueName();
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <array>
@@ -1593,7 +1593,7 @@ namespace Progmasoft::Catch3::Runner
ToHex(std::uint64_t value);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <chrono>
#include <cstdint>
@@ -1862,7 +1862,7 @@ namespace Progmasoft::Catch3::Runner
WriteStandardError(std::string_view text) noexcept;
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <filesystem>
#include <optional>
@@ -1903,7 +1903,7 @@ namespace Progmasoft::Catch3::Runner
const std::filesystem::path &workingDirectory);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <mutex>
@@ -1976,7 +1976,7 @@ namespace Progmasoft::Catch3::Runner
Message(std::string_view kind);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cstdint>
#include <optional>
@@ -2066,7 +2066,7 @@ namespace Progmasoft::Catch3::Runner
ParseTrx(std::string_view text);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
@@ -2114,7 +2114,7 @@ namespace Progmasoft::Catch3::Runner
RunResultFromJson(const JsonValue &value);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
@@ -2162,7 +2162,7 @@ namespace Progmasoft::Catch3::Runner
const SchedulerEvents &events);
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
// The state the scheduler keeps of jobs, workers and tests.
@@ -2326,7 +2326,7 @@ namespace Progmasoft::Catch3::Runner::Scheduling
};
} // namespace Progmasoft::Catch3::Runner::Scheduling
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <array>
#include <optional>
@@ -2354,7 +2354,7 @@ namespace Progmasoft::Catch3::Runner
};
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <filesystem>
#include <string>
@@ -2386,7 +2386,7 @@ namespace Progmasoft::Catch3
TestTemporaryDirectory();
} // namespace Progmasoft::Catch3
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
namespace Progmasoft::Catch3
{
@@ -2394,7 +2394,7 @@ namespace Progmasoft::Catch3
inline constexpr const char *kVersion = "0.4.0";
} // namespace Progmasoft::Catch3
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <iosfwd>
#include <string>
@@ -8913,7 +8913,7 @@ namespace Catch {
} // namespace Detail
} // namespace Catch
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <cstdio>
@@ -9105,7 +9105,7 @@ namespace Progmasoft::Catch3::Detail
}
} // namespace Progmasoft::Catch3::Detail
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <array>
#include <string_view>
@@ -9440,7 +9440,7 @@ namespace Progmasoft::Catch3
}
} // namespace Progmasoft::Catch3
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include "catch_amalgamated_third_party.hpp"
@@ -9766,7 +9766,7 @@ namespace Progmasoft::Catch3
}
} // namespace Progmasoft::Catch3
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
@@ -10134,7 +10134,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <cmath>
#include <iterator>
@@ -10419,7 +10419,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <cstdio>
#include <set>
@@ -10950,7 +10950,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <atomic>
#include <cstdlib>
@@ -11632,7 +11632,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <atomic>
#include <chrono>
#include <cstdio>
@@ -12214,7 +12214,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#if defined(_WIN32)
@@ -12416,7 +12416,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
@@ -12586,7 +12586,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cstring>
#include <fstream>
@@ -12803,7 +12803,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <cmath>
#include <system_error>
@@ -13299,7 +13299,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cmath>
@@ -13807,7 +13807,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <clocale>
@@ -15055,7 +15055,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
@@ -15671,7 +15671,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <cctype>
#include <cstdio>
@@ -17071,7 +17071,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cmath>
#include <cstdint>
#include <cstdio>
@@ -17621,7 +17621,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
namespace Progmasoft::Catch3::Runner
{
@@ -17684,7 +17684,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <cctype>
#include <cmath>
@@ -17998,7 +17998,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
// The JSON reports: Catch3's own and CTRF.
#include <utility>
@@ -18269,7 +18269,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
// The Test Anything Protocol, versions 12 to 14.
#include <algorithm>
@@ -18611,7 +18611,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
// The XML reports: JUnit, xUnit.net v2 and Visual Studio's TRX.
#include <cstdlib>
@@ -19116,7 +19116,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
namespace Progmasoft::Catch3::Runner
{
@@ -19516,7 +19516,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <chrono>
#include <cstdio>
@@ -20564,7 +20564,7 @@ namespace Progmasoft::Catch3
}
} // namespace Progmasoft::Catch3
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <algorithm>
#include <chrono>
#include <condition_variable>
@@ -22050,7 +22050,7 @@ namespace Progmasoft::Catch3::Runner
}
} // namespace Progmasoft::Catch3::Runner
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/extras/catch_amalgamated.hpp b/extras/catch_amalgamated.hpp
index 0cee5196..a5368d8b 100644
--- a/extras/catch_amalgamated.hpp
+++ b/extras/catch_amalgamated.hpp
@@ -12,8 +12,8 @@
// You probably shouldn't edit it directly.
//
// The parts that come from src/Progmasoft, the Catch3 runner, keep
-// their own copyright and license lines (MPL-2.0 WITH
-// AdditionRef-Progmasoft-Exception-2.0). The runner needs C++17.
+// their own copyright and license lines (LGPL-3.0-or-later). The
+// runner needs C++17.
// ----------------------------------------------------------
#ifndef CATCH_AMALGAMATED_HPP_INCLUDED
#define CATCH_AMALGAMATED_HPP_INCLUDED
@@ -11738,7 +11738,7 @@ namespace Catch {
// Copyright (c) 2026 Progmasoft.
-// SPDX-License-Identifier: MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0
+// SPDX-License-Identifier: LGPL-3.0-or-later
#include <cstddef>
#include <exception>
diff --git a/extras/catch_amalgamated_third_party.hpp b/extras/catch_amalgamated_third_party.hpp
index b6bb783b..2c96fb51 100644
--- a/extras/catch_amalgamated_third_party.hpp
+++ b/extras/catch_amalgamated_third_party.hpp
@@ -5,7 +5,7 @@
// third_party/. You probably shouldn't edit it directly.
//
// yyjson and pugixml keep their MIT licenses, stated in their text below;
-// the rest is MPL-2.0 WITH AdditionRef-Progmasoft-Exception-2.0. Only
+// the rest is LGPL-3.0-or-later. Only
// catch_amalgamated.cpp includes this file.
// ----------------------------------------------------------
#pragma once