diff options
| author | Maksim Ivanov <emaxx@chromium.org> | 2019-03-13 23:55:05 +0100 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-14 01:32:28 -0700 |
| commit | ba1ed774a9b0eeb71ee7ef94919d17f00dba3a54 (patch) | |
| tree | 986e18278025961db3074b81e25f67508db4c2be /brillo/daemons | |
| parent | 6df4b779027c3d86c3a24232ac16ae6f92e92bb0 (diff) | |
| download | libbrillo-ba1ed774a9b0eeb71ee7ef94919d17f00dba3a54.tar.gz | |
libbrillo: Fix D-Bus namespace usage in headers
Explicitly qualify the symbols used from the libchrome's "dbus"
namespace, by adding double-colon before them.
This fixes compilation errors when these headers are included after
libbrillo's GLib D-Bus helpers, which define the "brillo::dbus"
namespace.
BUG=chromium:941748
TEST=manual
Change-Id: I91ded54c7f47301566e164135cab0b24cc253f5c
Reviewed-on: https://chromium-review.googlesource.com/1522146
Commit-Ready: Maksim Ivanov <emaxx@chromium.org>
Tested-by: Maksim Ivanov <emaxx@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Cr-Mirrored-From: https://chromium.googlesource.com/chromiumos/platform2
Cr-Mirrored-Commit: 167688c6ea09e3773b4fa4a2cca76fd87ed33ec3
Diffstat (limited to 'brillo/daemons')
| -rw-r--r-- | brillo/daemons/dbus_daemon.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/brillo/daemons/dbus_daemon.h b/brillo/daemons/dbus_daemon.h index 25ce306..2017e7f 100644 --- a/brillo/daemons/dbus_daemon.h +++ b/brillo/daemons/dbus_daemon.h @@ -37,7 +37,7 @@ class BRILLO_EXPORT DBusDaemon : public Daemon { // A reference to the |dbus_connection_| bus object often used by derived // classes. - scoped_refptr<dbus::Bus> bus_; + scoped_refptr<::dbus::Bus> bus_; private: DBusConnection dbus_connection_; @@ -59,7 +59,7 @@ class BRILLO_EXPORT DBusServiceDaemon : public DBusDaemon { // not created and is not available as part of the D-Bus service. explicit DBusServiceDaemon(const std::string& service_name); DBusServiceDaemon(const std::string& service_name, - const dbus::ObjectPath& object_manager_path); + const ::dbus::ObjectPath& object_manager_path); DBusServiceDaemon(const std::string& service_name, base::StringPiece object_manager_path); @@ -76,7 +76,7 @@ class BRILLO_EXPORT DBusServiceDaemon : public DBusDaemon { dbus_utils::AsyncEventSequencer* sequencer); std::string service_name_; - dbus::ObjectPath object_manager_path_; + ::dbus::ObjectPath object_manager_path_; std::unique_ptr<dbus_utils::ExportedObjectManager> object_manager_; private: |