| commit | a44d04ae66815d117c864a137db5674e6a3f3f32 | [log] [tgz] |
|---|---|---|
| author | Jordan Bayles <jophba@chromium.org> | Wed May 06 16:59:39 2020 -0700 |
| committer | Jordan Bayles <jophba@chromium.org> | Thu May 07 17:26:46 2020 +0000 |
| tree | c6c27e3f516886fe266b2a0d6e35b97376d762bd | |
| parent | 4aa11daaa6795b52c57b26376502a0c273700f2e [diff] [blame] |
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>
diff --git a/platform/impl/task_runner.cc b/platform/impl/task_runner.cc index ac4a49a..d8f941c 100644 --- a/platform/impl/task_runner.cc +++ b/platform/impl/task_runner.cc
@@ -7,7 +7,7 @@ #include <csignal> #include <thread> -#include "util/logging.h" +#include "util/osp_logging.h" namespace openscreen {