Merge branch 'master' into fix/ScrollView

Tencent · Mar 7, 2024 · b54055f · b54055f
2 parents 9178427 + ea6bd3b
commit b54055f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/core/third_party/base/include/base/logging.h b/core/third_party/base/include/base/logging.h
@@ -25,6 +25,7 @@
 #include <codecvt>
 #include <sstream>
 #include <mutex>
+#include <functional>
 
 #include "log_level.h"
 #include "macros.h"

diff --git a/core/third_party/base/src/platform/ios/logging.cc b/core/third_party/base/src/platform/ios/logging.cc
@@ -23,7 +23,6 @@
 #include "base/logging.h"
 
 #include <syslog.h>
-
 #include <algorithm>
 #include <iostream>