diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce7043ed..ad0695ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,13 +174,13 @@ jobs: - name: AVR run: avr-g++ -std=c++11 -Isrc extras/conf_test/avr.cpp - name: GCC 32-bit - run: g++ -std=c++11 -m32 -Isrc extras/conf_test/x86.cpp + run: g++ -std=c++11 -m32 -Isrc extras/conf_test/linux32.cpp - name: GCC 64-bit - run: g++ -std=c++11 -m64 -Isrc extras/conf_test/x64.cpp + run: g++ -std=c++11 -m64 -Isrc extras/conf_test/linux64.cpp - name: Clang 32-bit - run: clang++ -std=c++11 -m32 -Isrc extras/conf_test/x86.cpp + run: clang++ -std=c++11 -m32 -Isrc extras/conf_test/linux32.cpp - name: Clang 64-bit - run: clang++ -std=c++11 -m64 -Isrc extras/conf_test/x64.cpp + run: clang++ -std=c++11 -m64 -Isrc extras/conf_test/linux64.cpp conf_test_windows: name: Test configuration on Windows @@ -192,12 +192,12 @@ jobs: - name: 32-bit run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat" - cl /Isrc extras/conf_test/x86.cpp + cl /Isrc extras/conf_test/win32.cpp shell: cmd - name: 64-bit run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - cl /Isrc extras/conf_test/x64.cpp + cl /Isrc extras/conf_test/win64.cpp shell: cmd xcode: diff --git a/extras/conf_test/x86.cpp b/extras/conf_test/linux32.cpp similarity index 100% rename from extras/conf_test/x86.cpp rename to extras/conf_test/linux32.cpp diff --git a/extras/conf_test/x64.cpp b/extras/conf_test/linux64.cpp similarity index 100% rename from extras/conf_test/x64.cpp rename to extras/conf_test/linux64.cpp diff --git a/extras/conf_test/win32.cpp b/extras/conf_test/win32.cpp new file mode 100644 index 00000000..a9874efd --- /dev/null +++ b/extras/conf_test/win32.cpp @@ -0,0 +1,14 @@ +#include + +static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); + +static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE"); + +static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); + +static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); + +static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 16, + "sizeof(VariantSlot)"); + +int main() {} diff --git a/extras/conf_test/win64.cpp b/extras/conf_test/win64.cpp new file mode 100644 index 00000000..2b533bf7 --- /dev/null +++ b/extras/conf_test/win64.cpp @@ -0,0 +1,14 @@ +#include + +static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG"); + +static_assert(ARDUINOJSON_SLOT_ID_SIZE == 4, "ARDUINOJSON_SLOT_ID_SIZE"); + +static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN"); + +static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE"); + +static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 24, + "sizeof(VariantSlot)"); + +int main() {}