summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authorspang <spang@chromium.org>2015-09-14 10:49:40 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-14 17:50:11 +0000
commit95f15875106062c4dd3c5927be7f6ee5775eb78a (patch)
treeac6e7cbdb97e770472cd78dd048e474624b9d1b1 /dbus
parent5ae0f3cfa02de9fcb8f8ab33e6944b06fccf5cf0 (diff)
downloadchromium_src-95f15875106062c4dd3c5927be7f6ee5775eb78a.zip
chromium_src-95f15875106062c4dd3c5927be7f6ee5775eb78a.tar.gz
chromium_src-95f15875106062c4dd3c5927be7f6ee5775eb78a.tar.bz2
Revert of Export various dbus::Property template specializations. (patchset #2 id:20001 of https://codereview.chromium.org/1339763003/ )
Reason for revert: Does not compile with component=shared_library with CrOS compiler ../../dbus/property.h:437:42: error: type attributes ignored after type is already defined [-Werror=attributes] extern template class CHROME_DBUS_EXPORT Property<uint8>; ^ ../../dbus/property.h:447:42: error: type attributes ignored after type is already defined [-Werror=attributes] extern template class CHROME_DBUS_EXPORT Property<bool>; Repro steps: cros chrome-sdk --board=amd64-generic --component gclient runhooks ninja -C out_amd64-generic/Release dbus Original issue's description: > Export various dbus::Property template specializations. > > BUG=409111 > R=stevenjb@chromium.org > > Committed: https://chromium.googlesource.com/chromium/src/+/40855d43fa71c215829b53a1034b1b653b4b8557 TBR=stevenjb@chromium.org,thakis@chromium.org,dcheng@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=409111 Review URL: https://codereview.chromium.org/1337113005 Cr-Commit-Position: refs/heads/master@{#348651}
Diffstat (limited to 'dbus')
-rw-r--r--dbus/property.h230
1 files changed, 87 insertions, 143 deletions
diff --git a/dbus/property.h b/dbus/property.h
index 5d791b6..5f36d69 100644
--- a/dbus/property.h
+++ b/dbus/property.h
@@ -426,157 +426,101 @@ class CHROME_DBUS_EXPORT Property : public PropertyBase {
T set_value_;
};
-template <>
-CHROME_DBUS_EXPORT Property<uint8>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<uint8>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<uint8>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<uint8>;
-
-template <>
-CHROME_DBUS_EXPORT Property<bool>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<bool>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<bool>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<bool>;
-
-template <>
-CHROME_DBUS_EXPORT Property<int16>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<int16>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<int16>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<int16>;
-
-template <>
-CHROME_DBUS_EXPORT Property<uint16>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<uint16>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<uint16>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<uint16>;
-
-template <>
-CHROME_DBUS_EXPORT Property<int32>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<int32>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<int32>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<int32>;
-
-template <>
-CHROME_DBUS_EXPORT Property<uint32>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<uint32>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<uint32>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<uint32>;
-
-template <>
-CHROME_DBUS_EXPORT Property<int64>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<int64>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<int64>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<int64>;
-
-template <>
-CHROME_DBUS_EXPORT Property<uint64>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<uint64>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<uint64>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<uint64>;
-
-template <>
-CHROME_DBUS_EXPORT Property<double>::Property();
-template <>
-CHROME_DBUS_EXPORT bool Property<double>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<double>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<double>;
-
-template <>
-CHROME_DBUS_EXPORT bool Property<std::string>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<std::string>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<std::string>;
-
-template <>
-CHROME_DBUS_EXPORT bool Property<ObjectPath>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<ObjectPath>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<ObjectPath>;
-
-template <>
-CHROME_DBUS_EXPORT bool Property<std::vector<std::string>>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<
- std::vector<std::string>>::AppendSetValueToWriter(MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<std::vector<std::string>>;
-
-template <>
-CHROME_DBUS_EXPORT bool Property<std::vector<ObjectPath>>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<
- std::vector<ObjectPath>>::AppendSetValueToWriter(MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<std::vector<ObjectPath>>;
-
-template <>
-CHROME_DBUS_EXPORT bool Property<std::vector<uint8>>::PopValueFromReader(
- MessageReader* reader);
-template <>
-CHROME_DBUS_EXPORT void Property<std::vector<uint8>>::AppendSetValueToWriter(
- MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT Property<std::vector<uint8>>;
-
-template <>
-CHROME_DBUS_EXPORT bool
-Property<std::map<std::string, std::string>>::PopValueFromReader(
+template <> Property<uint8>::Property();
+template <> bool Property<uint8>::PopValueFromReader(MessageReader* reader);
+template <> void Property<uint8>::AppendSetValueToWriter(MessageWriter* writer);
+extern template class Property<uint8>;
+
+template <> Property<bool>::Property();
+template <> bool Property<bool>::PopValueFromReader(MessageReader* reader);
+template <> void Property<bool>::AppendSetValueToWriter(MessageWriter* writer);
+extern template class Property<bool>;
+
+template <> Property<int16>::Property();
+template <> bool Property<int16>::PopValueFromReader(MessageReader* reader);
+template <> void Property<int16>::AppendSetValueToWriter(MessageWriter* writer);
+extern template class Property<int16>;
+
+template <> Property<uint16>::Property();
+template <> bool Property<uint16>::PopValueFromReader(MessageReader* reader);
+template <> void Property<uint16>::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<uint16>;
+
+template <> Property<int32>::Property();
+template <> bool Property<int32>::PopValueFromReader(MessageReader* reader);
+template <> void Property<int32>::AppendSetValueToWriter(MessageWriter* writer);
+extern template class Property<int32>;
+
+template <> Property<uint32>::Property();
+template <> bool Property<uint32>::PopValueFromReader(MessageReader* reader);
+template <> void Property<uint32>::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<uint32>;
+
+template <> Property<int64>::Property();
+template <> bool Property<int64>::PopValueFromReader(MessageReader* reader);
+template <> void Property<int64>::AppendSetValueToWriter(MessageWriter* writer);
+extern template class Property<int64>;
+
+template <> Property<uint64>::Property();
+template <> bool Property<uint64>::PopValueFromReader(MessageReader* reader);
+template <> void Property<uint64>::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<uint64>;
+
+template <> Property<double>::Property();
+template <> bool Property<double>::PopValueFromReader(MessageReader* reader);
+template <> void Property<double>::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<double>;
+
+template <> bool Property<std::string>::PopValueFromReader(
+ MessageReader* reader);
+template <> void Property<std::string>::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<std::string>;
+
+template <> bool Property<ObjectPath>::PopValueFromReader(
+ MessageReader* reader);
+template <> void Property<ObjectPath>::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<ObjectPath>;
+
+template <> bool Property<std::vector<std::string> >::PopValueFromReader(
+ MessageReader* reader);
+template <> void Property<std::vector<std::string> >::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<std::vector<std::string> >;
+
+template <> bool Property<std::vector<ObjectPath> >::PopValueFromReader(
+ MessageReader* reader);
+template <> void Property<std::vector<ObjectPath> >::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<std::vector<ObjectPath> >;
+
+template <> bool Property<std::vector<uint8> >::PopValueFromReader(
+ MessageReader* reader);
+template <> void Property<std::vector<uint8> >::AppendSetValueToWriter(
+ MessageWriter* writer);
+extern template class Property<std::vector<uint8> >;
+
+template <>
+bool Property<std::map<std::string, std::string>>::PopValueFromReader(
MessageReader* reader);
template <>
-CHROME_DBUS_EXPORT void
-Property<std::map<std::string, std::string>>::AppendSetValueToWriter(
+void Property<std::map<std::string, std::string>>::AppendSetValueToWriter(
MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT
- Property<std::map<std::string, std::string>>;
+extern template class Property<std::map<std::string, std::string>>;
template <>
-CHROME_DBUS_EXPORT bool
-Property<std::vector<std::pair<std::vector<uint8_t>, uint16_t>>>::
+bool Property<std::vector<std::pair<std::vector<uint8_t>, uint16_t>>>::
PopValueFromReader(MessageReader* reader);
template <>
-CHROME_DBUS_EXPORT void
-Property<std::vector<std::pair<std::vector<uint8_t>, uint16_t>>>::
+void Property<std::vector<std::pair<std::vector<uint8_t>, uint16_t>>>::
AppendSetValueToWriter(MessageWriter* writer);
-extern template class CHROME_DBUS_EXPORT
- Property<std::vector<std::pair<std::vector<uint8_t>, uint16_t>>>;
+extern template class Property<
+ std::vector<std::pair<std::vector<uint8_t>, uint16_t>>>;
} // namespace dbus