Skip to content

Commit f624462

Browse files
cynthiajianga-maurice
authored andcommitted
[RemoteConfig]fix cmake build fail caused by std::move
PiperOrigin-RevId: 290367052
1 parent 4778fba commit f624462

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

remote_config/src/android/remote_config_android.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
#define FIREBASE_REMOTE_CONFIG_CLIENT_CPP_SRC_ANDROID_REMOTE_CONFIG_ANDROID_H_
1717

1818
#include "firebase/app.h"
19+
#include "app/meta/move.h"
1920
#include "app/src/mutex.h"
2021
#include "app/src/reference_count.h"
2122
#include "app/src/reference_counted_future_impl.h"
2223
#include "app/src/util_android.h"
24+
#include "app/src/include/firebase/internal/common.h"
2325
#include "firebase/future.h"
2426
#include "remote_config/src/include/firebase/remote_config.h"
2527

@@ -91,7 +93,11 @@ class RemoteConfigInternal {
9193

9294
void SaveTmpKeysToDefault(std::vector<std::string> tmp_default_keys) {
9395
MutexLock lock(default_key_mutex_);
94-
default_keys_ = std::move(tmp_default_keys);
96+
#if defined(FIREBASE_USE_MOVE_OPERATORS)
97+
default_keys_ = firebase::Move(tmp_default_keys);
98+
#else
99+
default_keys_ = tmp_default_keys;
100+
#endif // FIREBASE_USE_MOVE_OPERATORS
95101
}
96102

97103
private:

0 commit comments

Comments
 (0)