Rename base to osp_base
Currently, our base/ folder causes issues when built with Chromium,
since files in Chromium need access to files from both Chromium base
and Open Screen base. This patch fixes that issue by renaming Open
Screen's base implementation to osp_base
Change-Id: If9d246fb32b9765bd4f1d98d880fbec4bf3689ad
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1592358
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Reviewed-by: Brandon Tolsch <btolsch@chromium.org>
diff --git a/platform/api/socket.h b/platform/api/socket.h
index 59f5bcc..22e7061 100644
--- a/platform/api/socket.h
+++ b/platform/api/socket.h
@@ -8,9 +8,9 @@
#include <cstdint>
#include <memory>
-#include "base/error.h"
-#include "base/ip_address.h"
-#include "base/macros.h"
+#include "osp_base/error.h"
+#include "osp_base/ip_address.h"
+#include "osp_base/macros.h"
#include "platform/api/network_interface.h"
namespace openscreen {
@@ -83,7 +83,7 @@
~UdpSocket();
private:
- DISALLOW_COPY_AND_ASSIGN(UdpSocket);
+ OSP_DISALLOW_COPY_AND_ASSIGN(UdpSocket);
};
} // namespace platform