diff options
| author | Jordan Bayles <jophba@chromium.org> | 2020-05-06 16:59:39 -0700 |
|---|---|---|
| committer | Jordan Bayles <jophba@chromium.org> | 2020-05-07 17:26:46 +0000 |
| commit | a44d04ae66815d117c864a137db5674e6a3f3f32 (patch) | |
| tree | c6c27e3f516886fe266b2a0d6e35b97376d762bd /osp/impl/presentation | |
| parent | 4aa11daaa6795b52c57b26376502a0c273700f2e (diff) | |
| download | openscreen-a44d04ae66815d117c864a137db5674e6a3f3f32.tar.gz | |
Rename util/logging.h to avoid collisions
Currently, the util/logging.h file causes build issues because other
external repos have the same file.
This patch fixes this bug by renaming our copy of logging.h to
osp_logging.h, the same way we renamed DCHECK to OSP_DCHECK.
Bug: b/155927492
Change-Id: I75ff546775bed01daeda2a631c06b4776e3829f1
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2186351
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Diffstat (limited to 'osp/impl/presentation')
6 files changed, 6 insertions, 6 deletions
diff --git a/osp/impl/presentation/presentation_common.h b/osp/impl/presentation/presentation_common.h index a10da1fb..eed24f94 100644 --- a/osp/impl/presentation/presentation_common.h +++ b/osp/impl/presentation/presentation_common.h @@ -13,7 +13,7 @@ #include "osp/public/network_service_manager.h" #include "osp/public/protocol_connection_server.h" #include "platform/api/time.h" -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen { namespace osp { diff --git a/osp/impl/presentation/presentation_connection.cc b/osp/impl/presentation/presentation_connection.cc index 9220b63b..19684c76 100644 --- a/osp/impl/presentation/presentation_connection.cc +++ b/osp/impl/presentation/presentation_connection.cc @@ -15,7 +15,7 @@ #include "osp/public/presentation/presentation_controller.h" #include "osp/public/presentation/presentation_receiver.h" #include "osp/public/protocol_connection.h" -#include "util/logging.h" +#include "util/osp_logging.h" #include "util/std_util.h" // TODO(crbug.com/openscreen/27): Address TODOs in this file diff --git a/osp/impl/presentation/presentation_controller.cc b/osp/impl/presentation/presentation_controller.cc index 94ee4e2d..ab090200 100644 --- a/osp/impl/presentation/presentation_controller.cc +++ b/osp/impl/presentation/presentation_controller.cc @@ -15,7 +15,7 @@ #include "osp/public/message_demuxer.h" #include "osp/public/network_service_manager.h" #include "osp/public/protocol_connection_client.h" -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen { namespace osp { diff --git a/osp/impl/presentation/presentation_receiver.cc b/osp/impl/presentation/presentation_receiver.cc index eb60e0bb..9afbd982 100644 --- a/osp/impl/presentation/presentation_receiver.cc +++ b/osp/impl/presentation/presentation_receiver.cc @@ -13,7 +13,7 @@ #include "osp/public/network_service_manager.h" #include "osp/public/protocol_connection_server.h" #include "platform/api/time.h" -#include "util/logging.h" +#include "util/osp_logging.h" #include "util/trace_logging.h" namespace openscreen { diff --git a/osp/impl/presentation/url_availability_requester.cc b/osp/impl/presentation/url_availability_requester.cc index b5e3bae7..93c53b0f 100644 --- a/osp/impl/presentation/url_availability_requester.cc +++ b/osp/impl/presentation/url_availability_requester.cc @@ -10,7 +10,7 @@ #include "osp/impl/presentation/presentation_common.h" #include "osp/public/network_service_manager.h" -#include "util/logging.h" +#include "util/osp_logging.h" using std::chrono::seconds; diff --git a/osp/impl/presentation/url_availability_requester_unittest.cc b/osp/impl/presentation/url_availability_requester_unittest.cc index 578c8612..4b601b38 100644 --- a/osp/impl/presentation/url_availability_requester_unittest.cc +++ b/osp/impl/presentation/url_availability_requester_unittest.cc @@ -15,7 +15,7 @@ #include "osp/public/testing/message_demuxer_test_support.h" #include "platform/test/fake_clock.h" #include "platform/test/fake_task_runner.h" -#include "util/logging.h" +#include "util/osp_logging.h" using std::chrono::milliseconds; using std::chrono::seconds; |