From 5d849ecc6adbce6d37a0a15951b608e684f54ae0 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 17 Apr 2019 00:08:13 +0200 Subject: [PATCH] Compilation fixes --- radio/src/storage/conversions/conversions_216_218.cpp | 4 ++-- radio/src/storage/conversions/conversions_218_219.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/storage/conversions/conversions_216_218.cpp b/radio/src/storage/conversions/conversions_216_218.cpp index bb9363426..6fee1dd12 100644 --- a/radio/src/storage/conversions/conversions_216_218.cpp +++ b/radio/src/storage/conversions/conversions_216_218.cpp @@ -901,7 +901,7 @@ void convertModelData_216_to_217(ModelData &model) // PPM center range // Telemetry custom screens - static_assert(sizeof(ModelData_v216) <= sizeof(ModelData)); + static_assert(sizeof(ModelData_v216) <= sizeof(ModelData), "ModelData size has been reduced"); ModelData_v216 oldModel; memcpy(&oldModel, &model, sizeof(oldModel)); @@ -1076,7 +1076,7 @@ void convertModelData_216_to_217(ModelData &model) void convertModelData_217_to_218(ModelData &model) { - static_assert(sizeof(ModelData_v217) <= sizeof(ModelData)); + static_assert(sizeof(ModelData_v217) <= sizeof(ModelData), "ModelData size has been reduced"); ModelData_v217 oldModel; memcpy(&oldModel, &model, sizeof(oldModel)); diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp index 6db35fddc..00f9aff11 100644 --- a/radio/src/storage/conversions/conversions_218_219.cpp +++ b/radio/src/storage/conversions/conversions_218_219.cpp @@ -34,7 +34,7 @@ typedef ModelData ModelData_v219; void convertModelData_218_to_219(ModelData &model) { - static_assert(sizeof(ModelData_v218) <= sizeof(ModelData)); + static_assert(sizeof(ModelData_v218) <= sizeof(ModelData), "ModelData size has been reduced"); ModelData_v218 oldModel; memcpy(&oldModel, &model, sizeof(oldModel));