Skip to content

Commit 277c6a1

Browse files
committed
Define TOML11_DISABLE_SOURCE_LOCATION (up for discussion)
1 parent 0e48be5 commit 277c6a1

4 files changed

Lines changed: 31 additions & 6 deletions

File tree

include/openPMD/auxiliary/JSON_internal.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323

2424
#include "openPMD/config.hpp"
2525

26-
#include <deque>
27-
#include <nlohmann/json.hpp>
28-
#include <toml.hpp>
26+
#include "openPMD/auxiliary/toml11_wrapper.hpp"
2927

30-
#include <optional>
28+
#include <nlohmann/json.hpp>
3129

3230
#if openPMD_HAVE_MPI
3331
#include <mpi.h>
3432
#endif
3533

34+
#include <deque>
3635
#include <memory> // std::shared_ptr
36+
#include <optional>
3737
#include <utility> // std::forward
3838

3939
namespace openPMD
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/* Copyright 2026 Franz Poeschel
2+
*
3+
* This file is part of openPMD-api.
4+
*
5+
* openPMD-api is free software: you can redistribute it and/or modify
6+
* it under the terms of of either the GNU General Public License or
7+
* the GNU Lesser General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* openPMD-api is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License and the GNU Lesser General Public License
15+
* for more details.
16+
*
17+
* You should have received a copy of the GNU General Public License
18+
* and the GNU Lesser General Public License along with openPMD-api.
19+
* If not, see <http://www.gnu.org/licenses/>.
20+
*/
21+
22+
#pragma once
23+
24+
#define TOML11_DISABLE_SOURCE_LOCATION
25+
#include <toml.hpp>

src/IO/JSON/JSONIOHandlerImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
#include "openPMD/auxiliary/Memory.hpp"
3232
#include "openPMD/auxiliary/StringManip.hpp"
3333
#include "openPMD/auxiliary/TypeTraits.hpp"
34+
#include "openPMD/auxiliary/toml11_wrapper.hpp"
3435
#include "openPMD/backend/Attribute.hpp"
3536
#include "openPMD/backend/Writable.hpp"
3637

3738
#include <iomanip>
3839
#include <sstream>
39-
#include <toml.hpp>
4040

4141
#include <algorithm>
4242
#include <exception>

src/auxiliary/JSON.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
#include "openPMD/auxiliary/Filesystem.hpp"
2727
#include "openPMD/auxiliary/StringManip.hpp"
2828
#include "openPMD/auxiliary/Variant.hpp"
29+
#include "openPMD/auxiliary/toml11_wrapper.hpp"
2930

3031
#include <limits>
3132
#include <queue>
32-
#include <toml.hpp>
3333

3434
#include <algorithm>
3535
#include <cctype> // std::isspace

0 commit comments

Comments
 (0)