shill: Removes unnecessary header files.
Also, adds DISALLOW_COPY_AND_ASSIGN where it was missing, before.
BUG=None.
TEST=unittest.
Change-Id: I44f3f0c7c8ab080c62c03418bc93bbf1bc099dcd
Reviewed-on: https://gerrit.chromium.org/gerrit/44845
Commit-Queue: Wade Guthrie <wdg@chromium.org>
Reviewed-by: Wade Guthrie <wdg@chromium.org>
Tested-by: Wade Guthrie <wdg@chromium.org>
diff --git a/netlink_attribute.h b/netlink_attribute.h
index 3dbfa7e..1c87a8b 100644
--- a/netlink_attribute.h
+++ b/netlink_attribute.h
@@ -9,7 +9,7 @@
#include <string>
-#include <base/memory/weak_ptr.h>
+#include <base/basictypes.h>
#include "shill/attribute_list.h"
#include "shill/byte_string.h"
@@ -144,6 +144,8 @@
std::string id_string_;
Type datatype_;
const char *datatype_string_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkAttribute);
};
class NetlinkU8Attribute : public NetlinkAttribute {
@@ -160,6 +162,8 @@
private:
uint8_t value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkU8Attribute);
};
class NetlinkU16Attribute : public NetlinkAttribute {
@@ -176,6 +180,8 @@
private:
uint16_t value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkU16Attribute);
};
class NetlinkU32Attribute : public NetlinkAttribute {
@@ -192,6 +198,8 @@
private:
uint32_t value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkU32Attribute);
};
class NetlinkU64Attribute : public NetlinkAttribute {
@@ -208,6 +216,8 @@
private:
uint64_t value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkU64Attribute);
};
class NetlinkFlagAttribute : public NetlinkAttribute {
@@ -224,6 +234,8 @@
private:
bool value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkFlagAttribute);
};
class NetlinkStringAttribute : public NetlinkAttribute {
@@ -240,6 +252,8 @@
private:
std::string value_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkStringAttribute);
};
class NetlinkNestedAttribute : public NetlinkAttribute {
@@ -311,6 +325,9 @@
const nlattr &attr,
const NestedData &nested_data);
AttributeListRefPtr value_;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(NetlinkNestedAttribute);
};
class NetlinkRawAttribute : public NetlinkAttribute {
@@ -326,6 +343,9 @@
virtual bool SetRawValue(const ByteString value);
virtual bool ToString(std::string *value) const;
virtual ByteString Encode() const;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(NetlinkRawAttribute);
};
class NetlinkAttributeGeneric : public NetlinkRawAttribute {
@@ -335,6 +355,8 @@
private:
std::string id_string_;
+
+ DISALLOW_COPY_AND_ASSIGN(NetlinkAttributeGeneric);
};
} // namespace shill