projects/aports·blob master · refs

34 lines · 1.4 KiB

1diff --git a/src/third-party/flatbuffers/stl_emulation.h b/src/third-party/flatbuffers/stl_emulation.h
2index 975de21..5464029 100644
3--- a/src/third-party/flatbuffers/stl_emulation.h
4+++ b/src/third-party/flatbuffers/stl_emulation.h
5@@ -547,7 +547,7 @@ class span FLATBUFFERS_FINAL_CLASS {
6 FLATBUFFERS_CONSTEXPR_CPP14 span &operator=(const span &other)
7 FLATBUFFERS_NOEXCEPT {
8 data_ = other.data_;
9- count_ = other.count_;
10+ //count_ = other.count_;
11 }
12
13 // Limited implementation of
14diff --git a/src/third-party/flatbuffers/util.h b/src/third-party/flatbuffers/util.h
15index f2659bd..3779c50 100644
16--- a/src/third-party/flatbuffers/util.h
17+++ b/src/third-party/flatbuffers/util.h
18@@ -217,6 +217,7 @@ inline std::string IntToStringHex(int i, int xdigits) {
19
20 // clang-format off
21 // Use locale independent functions {strtod_l, strtof_l, strtoll_l, strtoull_l}.
22+#define FLATBUFFERS_LOCALE_INDEPENDENT 0
23 #if defined(FLATBUFFERS_LOCALE_INDEPENDENT) && (FLATBUFFERS_LOCALE_INDEPENDENT > 0)
24 class ClassicLocale {
25 #ifdef _WIN32
26@@ -250,7 +251,7 @@ inline std::string IntToStringHex(int i, int xdigits) {
27 #define __strtof_impl(s, pe) strtof_l(s, pe, ClassicLocale::Get())
28 #endif
29 #else
30- #include "flatbuffers/cata_error_locale_dependent.h"
31+ // #include "flatbuffers/cata_error_locale_dependent.h"
32 #define __strtod_impl(s, pe) strtod(s, pe)
33 #define __strtof_impl(s, pe) static_cast<float>(strtod(s, pe))
34 #ifdef _MSC_VER