[shill] Build is broken...bad merge??
BUG=None
TEST=FEATURES=test emerge-x86-generic shill
Change-Id: I78e646c1d532adc374a7db28628238c8c4c30bdb
Reviewed-on: http://gerrit.chromium.org/gerrit/1471
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
diff --git a/device.h b/device.h
index 44ebd0f..8e9bca8 100644
--- a/device.h
+++ b/device.h
@@ -5,6 +5,7 @@
#ifndef SHILL_DEVICE_
#define SHILL_DEVICE_
+#include <string>
#include <vector>
#include <base/memory/ref_counted.h>
@@ -35,7 +36,7 @@
// A constructor for the Device object
Device(ControlInterface *control_interface,
EventDispatcher *dispatcher,
- const string &link_name,
+ const std::string& link_name,
int interface_index);
virtual ~Device();
@@ -46,7 +47,7 @@
protected:
std::vector<scoped_refptr<Service> > services_;
- string link_name_;
+ std::string link_name_;
int interface_index_;
bool running_;
@@ -62,7 +63,7 @@
public:
StubDevice(ControlInterface *control_interface,
EventDispatcher *dispatcher,
- const string link_name,
+ const std::string& link_name,
int interface_index,
Technology technology)
: Device(control_interface, dispatcher, link_name, interface_index),