mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-16 07:36:10 -04:00
Patch recent cls from nearby_connections;
Sync github to replace nearby_connections with nearby. PiperOrigin-RevId: 411609608
This commit is contained in:
hais
@@ -12,11 +12,11 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "third_party/nearby_connections/cpp/platform/api/crypto.h"
|
||||
#include "third_party/nearby/cpp/platform/api/crypto.h"
|
||||
|
||||
#import "third_party/absl/strings/string_view.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/utils.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Shared/GNCUtils.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Shared/GNCUtils.h"
|
||||
|
||||
namespace location {
|
||||
namespace nearby {
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/input_file.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/input_file.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
#import "third_party/nearby_connections/cpp/platform/base/exception.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/utils.h"
|
||||
#import "third_party/nearby/cpp/platform/base/exception.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h"
|
||||
|
||||
namespace location {
|
||||
namespace nearby {
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/log_message.h"
|
||||
#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/log_message.h"
|
||||
|
||||
#include "base/logging.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/api/log_message.h"
|
||||
#include "third_party/nearby/cpp/platform/api/log_message.h"
|
||||
#include "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h"
|
||||
|
||||
namespace location {
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
#define PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
|
||||
|
||||
#include "platform/api/submittable_executor.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/base/runnable.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h"
|
||||
#import "third_party/nearby/cpp/platform/base/runnable.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h"
|
||||
|
||||
namespace location {
|
||||
namespace nearby {
|
||||
|
||||
@@ -12,10 +12,10 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h"
|
||||
|
||||
#include "third_party/nearby_connections/cpp/platform/base/runnable.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h"
|
||||
#include "third_party/nearby/cpp/platform/base/runnable.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h"
|
||||
|
||||
namespace location {
|
||||
namespace nearby {
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/scheduled_executor.h"
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#include "third_party/absl/time/time.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/base/runnable.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/atomic_boolean.h"
|
||||
#include "third_party/nearby/cpp/platform/base/runnable.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/atomic_boolean.h"
|
||||
|
||||
// This wraps the C++ Runnable in an Obj-C object for memory management. It is retained by the
|
||||
// dispatch block below, and deleted when the block is released.
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#ifndef PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
|
||||
#define PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
|
||||
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/multi_thread_executor.h"
|
||||
|
||||
namespace location {
|
||||
namespace nearby {
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/utils.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h"
|
||||
|
||||
#import "third_party/absl/container/flat_hash_map.h"
|
||||
#include "third_party/absl/strings/string_view.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/base/byte_array.h"
|
||||
#include "third_party/nearby/cpp/platform/base/byte_array.h"
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "platform/api/wifi_lan.h"
|
||||
#include "platform/base/nsd_service_info.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" // IWYU pragma: export
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h" // IWYU pragma: export
|
||||
|
||||
@class GNCMBonjourBrowser;
|
||||
@class GNCMBonjourService;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/wifi_lan.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Platform/wifi_lan.h"
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
@@ -24,15 +24,15 @@
|
||||
#include "third_party/absl/strings/str_cat.h"
|
||||
#include "third_party/absl/strings/str_format.h"
|
||||
#include "third_party/absl/synchronization/mutex.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/api/wifi_lan.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/base/cancellation_flag.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/base/exception.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/base/nsd_service_info.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/base/prng.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h"
|
||||
#import "third_party/nearby_connections/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h"
|
||||
#include "third_party/nearby_connections/cpp/platform/impl/ios/Source/Platform/utils.h"
|
||||
#include "third_party/nearby/cpp/platform/api/wifi_lan.h"
|
||||
#include "third_party/nearby/cpp/platform/base/cancellation_flag.h"
|
||||
#include "third_party/nearby/cpp/platform/base/exception.h"
|
||||
#include "third_party/nearby/cpp/platform/base/nsd_service_info.h"
|
||||
#include "third_party/nearby/cpp/platform/base/prng.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/GNCMConnection.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h"
|
||||
#import "third_party/nearby/cpp/platform/impl/ios/Source/Mediums/WifiLan/GNCMBonjourService.h"
|
||||
#include "third_party/nearby/cpp/platform/impl/ios/Source/Platform/utils.h"
|
||||
#import "third_party/objective_c/google_toolbox_for_mac/Foundation/GTMLogger.h"
|
||||
|
||||
namespace location {
|
||||
|
||||
Reference in New Issue
Block a user