Resolved unified compilation issues

swan-amazon · May 10, 2024 · cf49990 · cf49990
1 parent 4301ef9
commit cf49990
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/platform/Linux/ConfigurationManagerImpl.h b/src/platform/Linux/ConfigurationManagerImpl.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2020 Project CHIP Authors
+ *    Copyright (c) 2020-2024 Project CHIP Authors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -60,17 +60,15 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;
     CHIP_ERROR WritePersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t value) override;
 
-    // NOTE: Other public interface methods are implemented by GenericConfigurationManagerImpl<>.
-    CHIP_ERROR WriteConfigValue(Key key, uint16_t val);
-    CHIP_ERROR ReadConfigValue(Key key, uint16_t & val);
-
     // ===== Members that implement the GenericConfigurationManagerImpl protected interface.
     CHIP_ERROR ReadConfigValue(Key key, bool & val) override;
+    CHIP_ERROR ReadConfigValue(Key key, uint16_t & val) override;
     CHIP_ERROR ReadConfigValue(Key key, uint32_t & val) override;
     CHIP_ERROR ReadConfigValue(Key key, uint64_t & val) override;
     CHIP_ERROR ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen) override;
     CHIP_ERROR ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen) override;
     CHIP_ERROR WriteConfigValue(Key key, bool val) override;
+    CHIP_ERROR WriteConfigValue(Key key, uint16_t val) override;
     CHIP_ERROR WriteConfigValue(Key key, uint32_t val) override;
     CHIP_ERROR WriteConfigValue(Key key, uint64_t val) override;
     CHIP_ERROR WriteConfigValueStr(Key key, const char * str) override;

diff --git a/src/platform/fake/ConfigurationManagerImpl.h b/src/platform/fake/ConfigurationManagerImpl.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2021-2022 Project CHIP Authors
+ *    Copyright (c) 2021-2024 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -76,6 +76,11 @@ class ConfigurationManagerImpl : public ConfigurationManager
     CHIP_ERROR StoreRegulatoryLocation(uint8_t location) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR GetCountryCode(char * buf, size_t bufSize, size_t & codeLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR StoreCountryCode(const char * code, size_t codeLen) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetTCAcceptedVersion(uint16_t & value) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetTCMinRequiredVersion(uint16_t & value) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetTCAcknowledgements(uint16_t & value) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR GetTCAcknowledgementsRequired(uint16_t & value) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR StoreTCAcknowledgements(uint16_t tcVersion, uint16_t tcUserResponse) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR GetRebootCount(uint32_t & rebootCount) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR StoreRebootCount(uint32_t rebootCount) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
     CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override { return CHIP_ERROR_NOT_IMPLEMENTED; }