Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/psv_pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,14 @@ jobs:
shell: bash

psv-linux-22-04-clang-hidden-build:
name: PSV.Linux.22.04.clang.hidden
name: PSV.Linux.22.04.clang.hidden.OLP_SDK_NO_EXCEPTION=ON
runs-on: ubuntu-22.04
env:
BUILD_TYPE: RelWithDebInfo
CC: clang-11
CXX: clang++-11
CXXFLAGS: -Wno-deprecated-copy
EXTRA_CMAKE_OPTIONS: -DCMAKE_CXX_VISIBILITY_PRESET=hidden -DOLP_SDK_ENABLE_TESTING=OFF
EXTRA_CMAKE_OPTIONS: -DCMAKE_CXX_VISIBILITY_PRESET=hidden -DOLP_SDK_ENABLE_TESTING=OFF -DOLP_SDK_NO_EXCEPTION=ON
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand Down
26 changes: 26 additions & 0 deletions external/boost/boost_182_json_noexceptions.diff
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
diff --git a/libs/json/include/boost/json/detail/value_to.hpp b/libs/json/include/boost/json/detail/value_to.hpp
index 7cb779e..6df1c9d 100644
--- a/libs/json/include/boost/json/detail/value_to.hpp
+++ b/libs/json/include/boost/json/detail/value_to.hpp
@@ -652,10 +652,13 @@ value_to_impl(
value const& jv,
user_conversion_tag)
{
+#ifndef BOOST_NO_EXCEPTIONS
try
{
+#endif // BOOST_NO_EXCEPTIONS
return {
boost::system::in_place_value, tag_invoke(value_to_tag<T>(), jv)};
+#ifndef BOOST_NO_EXCEPTIONS
}
catch( std::bad_alloc const&)
{
@@ -671,6 +674,7 @@ value_to_impl(
BOOST_JSON_FAIL(ec, error::exception);
return {boost::system::in_place_error, ec};
}
+#endif // BOOST_NO_EXCEPTIONS
}

// no suitable conversion implementation
diff --git a/libs/json/include/boost/json/impl/value.ipp b/libs/json/include/boost/json/impl/value.ipp
index 7460c02..7513b38 100644
--- a/libs/json/include/boost/json/impl/value.ipp
Expand Down
Loading