diff options
| author | Debian Multimedia Maintainers <debian-multimedia@lists.debian.org> | 2021-12-17 10:37:21 +0100 |
|---|---|---|
| committer | IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org> | 2023-07-27 12:37:36 +0200 |
| commit | a16175fa52515a7146cd4a115c21bbc7f6220671 (patch) | |
| tree | cb17562e5c68c42495003a236b127cbd394f37da /src | |
| parent | edf8accd01caa7162edf0b5631b4efa72e92e683 (diff) | |
Build against system-provided nlohmann/json
Origin: Debian
Forwarded: no
Last-Update: 2022-06-14
Gbp-Pq: Name 04-system-json.patch
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/conf.cpp | 4 | ||||
| -rw-r--r-- | src/core/midiMapper.h | 2 | ||||
| -rw-r--r-- | src/core/patch.cpp | 2 | ||||
| -rw-r--r-- | src/gui/langMapper.h | 2 | ||||
| -rw-r--r-- | src/mapper.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/core/conf.cpp b/src/core/conf.cpp index 462e514..a7fe3c0 100644 --- a/src/core/conf.cpp +++ b/src/core/conf.cpp @@ -32,7 +32,7 @@ #include <FL/Fl.H> #include <cassert> #include <fstream> -#include <nlohmann/json.hpp> +#include "nlohmann/json.hpp" #include <string> namespace nl = nlohmann; @@ -303,4 +303,4 @@ void Conf::sanitize() data.midiPortOut = std::max(-1, data.midiPortOut); data.midiPortIn = std::max(-1, data.midiPortIn); } -} // namespace giada::m
\ No newline at end of file +} // namespace giada::m diff --git a/src/core/midiMapper.h b/src/core/midiMapper.h index 8bcd890..e19c39b 100644 --- a/src/core/midiMapper.h +++ b/src/core/midiMapper.h @@ -28,7 +28,7 @@ #define G_MIDIMAPPER_H #include "mapper.h" -#include <nlohmann/json.hpp> +#include "nlohmann/json.hpp" #include <string> #include <vector> diff --git a/src/core/patch.cpp b/src/core/patch.cpp index bfeb64c..fd28dc3 100644 --- a/src/core/patch.cpp +++ b/src/core/patch.cpp @@ -29,7 +29,7 @@ #include "utils/log.h" #include "utils/math.h" #include <fstream> -#include <nlohmann/json.hpp> +#include "nlohmann/json.hpp" namespace nl = nlohmann; diff --git a/src/gui/langMapper.h b/src/gui/langMapper.h index 48f90cd..c78a37b 100644 --- a/src/gui/langMapper.h +++ b/src/gui/langMapper.h @@ -28,7 +28,7 @@ #define G_LANGMAPPER_H #include "mapper.h" -#include <nlohmann/json.hpp> +#include "nlohmann/json.hpp" #include <string> #include <unordered_map> #include <vector> diff --git a/src/mapper.h b/src/mapper.h index c22f13f..b5e720d 100644 --- a/src/mapper.h +++ b/src/mapper.h @@ -27,7 +27,7 @@ #ifndef G_MAPPER_H #define G_MAPPER_H -#include <nlohmann/json.hpp> +#include "nlohmann/json.hpp" #include <optional> #include <string> #include <vector> |