commit 46eaaf53d5e5b92f418b8d7cbfe7e847b575791f
author Chris Masone <cmasone@chromium.org> Tue May 24 13:08:30 2011 -0700
committer Chris Masone <cmasone@chromium.org> Tue May 24 13:51:29 2011 -0700
tree fa4e4e2f7958717431b132f0219bf58581f89434
parent d7732e4b308836ed21723c1ab412f640f02abdf1

[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>

wifi.h

diff --git a/wifi.h b/wifi.h
index 33e29d8..844d653 100644
--- a/wifi.h
+++ b/wifi.h
@@ -5,6 +5,8 @@
 #ifndef SHILL_WIFI_
 #define SHILL_WIFI_
 
+#include <string>
+
 #include "shill/device.h"
 #include "shill/shill_event.h"
 
@@ -16,7 +18,7 @@
  public:
   explicit WiFi(ControlInterface *control_interface,
                 EventDispatcher *dispatcher,
-                const string &link_name,
+                const std::string &link_name,
                 int interface_index);
   ~WiFi();
   bool TechnologyIs(Device::Technology type);