Merge pull request #838 from skliper/integration-candidate

HOTFIX for #801 on IC-20200819: Deprecated time format verify logic fix
nasa · Aug 25, 2020 · e4f7c26 · e4f7c26
2 parents faebfc1 + 582ea3b
commit e4f7c26
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/fsw/cfe-core/src/sb/cfe_sb_verify.h b/fsw/cfe-core/src/sb/cfe_sb_verify.h
@@ -80,8 +80,11 @@
     #error CFE_PLATFORM_SB_BUF_MEMORY_BYTES cannot be greater than UINT32_MAX (4 Gigabytes)!
 #endif
 
-#if ((CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_32_SUBS) || \
-     (CFE_MISSION_SB_PACKET_TIME_FORMAT == CFE_MISSION_SB_TIME_32_32_M_20))
+/*
+ * Legacy time formats no longer supported in core cFE, this will pass
+ * if default is selected or if both defines are removed
+ */
+#if (CFE_MISSION_SB_PACKET_TIME_FORMAT != CFE_MISSION_SB_TIME_32_16_SUBS)
     #error Legacy CFE_MISSION_SB_PACKET_TIME_FORMAT implementations no longer supported in core
 #endif