Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove glz::expected and always use std::expected #1314

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+41 −1,500
Open

Remove glz::expected and always use std::expected #1314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be4f166
Removed glaze expected implementation
stephenberry Sep 18, 2024
b185c4a
Merge branch 'main' into remove_glz_expected
stephenberry Dec 13, 2024
380e42e
Use -stdlib=libc++
stephenberry Dec 13, 2024
c07984d
Update quickfuzz.yml
stephenberry Dec 13, 2024
f3dcc87
Merge branch 'main' into remove_glz_expected
stephenberry Dec 18, 2024
25c57b7
Merge branch 'main' into remove_glz_expected
stephenberry Dec 18, 2024
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
6 changes: 6 additions & 0 deletions .github/workflows/exhaustive_float.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,19 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libc++-dev libc++abi-dev

- name: Configure CMake
run: |
cmake -B ${{github.workspace}}/build \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_C_COMPILER=${{env.CC}} \
-DCMAKE_CXX_COMPILER=${{env.CXX}} \
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-DBUILD_TESTING=Off

- name: Build
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/exhaustive_int.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,19 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libc++-dev libc++abi-dev

- name: Configure CMake
run: |
cmake -B ${{github.workspace}}/build \
-DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_C_COMPILER=${{env.CC}} \
-DCMAKE_CXX_COMPILER=${{env.CXX}} \
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-DBUILD_TESTING=Off

- name: Build
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/quickfuzz.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:

- name: Install dependencies
run: |
sudo echo apt-get update
sudo echo apt-get install -y libc++-dev libc++abi-dev
sudo apt-get update
sudo apt-get install -y libc++-dev libc++abi-dev

- name: Configure CMake
run: |
Expand All @@ -46,6 +46,7 @@ jobs:
-DCMAKE_CXX_STANDARD=${{matrix.std}} \
-DCMAKE_C_COMPILER=${{env.CC}} \
-DCMAKE_CXX_COMPILER=${{env.CXX}} \
-DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-DBUILD_TESTING=Off

- name: Build
Expand Down
22 changes: 22 additions & 0 deletions include/glaze/json/json_t.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,28 @@

#pragma once

#ifndef GLZ_THROW_OR_ABORT
#if __cpp_exceptions
#define GLZ_THROW_OR_ABORT(EXC) (throw(EXC))
#define GLZ_NOEXCEPT noexcept(false)
#else
#define GLZ_THROW_OR_ABORT(EXC) (std::abort())
#define GLZ_NOEXCEPT noexcept(true)
#endif
#endif

#if __cpp_exceptions
#include <stdexcept>
#endif

namespace glz
{
inline void glaze_error([[maybe_unused]] const char* msg) GLZ_NOEXCEPT
{
GLZ_THROW_OR_ABORT(std::runtime_error(msg));
}
}

#include <cstddef>
#include <map>
#include <variant>
Expand Down
Loading