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 /discovery/mdns | |
| 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 'discovery/mdns')
| -rw-r--r-- | discovery/mdns/mdns_reader.cc | 2 | ||||
| -rw-r--r-- | discovery/mdns/mdns_record_changed_callback.h | 2 | ||||
| -rw-r--r-- | discovery/mdns/mdns_records.h | 2 | ||||
| -rw-r--r-- | discovery/mdns/mdns_writer.cc | 2 | ||||
| -rw-r--r-- | discovery/mdns/public/mdns_constants.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/discovery/mdns/mdns_reader.cc b/discovery/mdns/mdns_reader.cc index 80aa9cb6..409de085 100644 --- a/discovery/mdns/mdns_reader.cc +++ b/discovery/mdns/mdns_reader.cc @@ -9,7 +9,7 @@ #include "discovery/common/config.h" #include "discovery/mdns/public/mdns_constants.h" -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen { namespace discovery { diff --git a/discovery/mdns/mdns_record_changed_callback.h b/discovery/mdns/mdns_record_changed_callback.h index 8b6e9fc0..a5518578 100644 --- a/discovery/mdns/mdns_record_changed_callback.h +++ b/discovery/mdns/mdns_record_changed_callback.h @@ -6,7 +6,7 @@ #define DISCOVERY_MDNS_MDNS_RECORD_CHANGED_CALLBACK_H_ #include "discovery/mdns/mdns_records.h" -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen { namespace discovery { diff --git a/discovery/mdns/mdns_records.h b/discovery/mdns/mdns_records.h index 9cacace6..0a1f76ab 100644 --- a/discovery/mdns/mdns_records.h +++ b/discovery/mdns/mdns_records.h @@ -19,7 +19,7 @@ #include "platform/base/error.h" #include "platform/base/interface_info.h" #include "platform/base/ip_address.h" -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen { namespace discovery { diff --git a/discovery/mdns/mdns_writer.cc b/discovery/mdns/mdns_writer.cc index fa79dc5d..a95605b8 100644 --- a/discovery/mdns/mdns_writer.cc +++ b/discovery/mdns/mdns_writer.cc @@ -7,7 +7,7 @@ #include "absl/hash/hash.h" #include "absl/strings/ascii.h" #include "util/hashing.h" -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen { namespace discovery { diff --git a/discovery/mdns/public/mdns_constants.h b/discovery/mdns/public/mdns_constants.h index e80e6826..76a49d1b 100644 --- a/discovery/mdns/public/mdns_constants.h +++ b/discovery/mdns/public/mdns_constants.h @@ -21,7 +21,7 @@ #include "platform/api/time.h" #include "platform/base/ip_address.h" -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen { namespace discovery { |