Merge pull request #426 from robszewczyk/bug/compilation-cleanup

robszewczyk · web-flow · commit ebabb5e6d31f · 2019-11-15T10:28:17.000-08:00
Compile inlined IsMsgCounterSyncReqInProgress iff feature flag is ena…
diff --git a/src/lib/core/WeaveFabricState.h b/src/lib/core/WeaveFabricState.h
@@ -623,7 +623,7 @@ class NL_DLL_EXPORT WeaveFabricState
     WEAVE_ERROR DeriveMsgEncAppKey(uint32_t keyId, uint8_t encType, WeaveMsgEncryptionKey & appKey, uint32_t& appGroupGlobalId);
 };
 
-
+#if WEAVE_CONFIG_USE_APP_GROUP_KEYS_FOR_MSG_ENC
 /**
  * This method returns true if at least one peer's message counter
  * synchronization request is in progress.
@@ -635,7 +635,7 @@ inline bool WeaveFabricState::IsMsgCounterSyncReqInProgress(void)
 {
     return (MsgCounterSyncStatus & kFlag_ReqInProgress) != 0;
 }
-
+#endif
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ class NL_DLL_EXPORT WeaveFabricState`
`623`	`623`	`WEAVE_ERROR DeriveMsgEncAppKey(uint32_t keyId, uint8_t encType, WeaveMsgEncryptionKey & appKey, uint32_t& appGroupGlobalId);`
`624`	`624`	`};`
`625`	`625`
`626`		`-`
	`626`	`+#if WEAVE_CONFIG_USE_APP_GROUP_KEYS_FOR_MSG_ENC`
`627`	`627`	`/**`
`628`	`628`	`* This method returns true if at least one peer's message counter`
`629`	`629`	`* synchronization request is in progress.`
`@@ -635,7 +635,7 @@ inline bool WeaveFabricState::IsMsgCounterSyncReqInProgress(void)`
`635`	`635`	`{`
`636`	`636`	`return (MsgCounterSyncStatus & kFlag_ReqInProgress) != 0;`
`637`	`637`	`}`
`638`		`-`
	`638`	`+#endif`
`639`	`639`
`640`	`640`
`641`	`641`