diff options
author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 08:10:43 +0000 |
---|---|---|
committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 08:10:43 +0000 |
commit | 3abb2ec4a51e4ca5319d8f9e77dfe445eef74eb2 (patch) | |
tree | c337b3d7f818a479f1c613bbc1946a3256e60627 /dbus | |
parent | 6160779a637cb09ec2834d200f30631568247d03 (diff) | |
download | chromium_src-3abb2ec4a51e4ca5319d8f9e77dfe445eef74eb2.zip chromium_src-3abb2ec4a51e4ca5319d8f9e77dfe445eef74eb2.tar.gz chromium_src-3abb2ec4a51e4ca5319d8f9e77dfe445eef74eb2.tar.bz2 |
Revert of [DBus] Explicitly instantiate dbus::Property variants (https://codereview.chromium.org/354553002/)
Reason for revert:
This causes link error:
http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder%20%28dbg%29/builds/48613/steps/compile/logs/stdio
Original issue's description:
> [DBus] Explicitly instantiate dbus::Property variants
>
> dbus::Property<std::vector<uint8> > isn't instantiated in libdbus in non-ChromeOS build + latest clang.
> That causes instantiation of the template in dbus_unittests, and causes link failure.
>
> BUG=
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=280264
TBR=keybuk@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/353063007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/property.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/dbus/property.h b/dbus/property.h index bfbddbe..f6baffc 100644 --- a/dbus/property.h +++ b/dbus/property.h @@ -350,7 +350,7 @@ class CHROME_DBUS_EXPORT PropertySet { // default value. Specializations for basic D-Bus types, strings, object // paths and arrays are provided for you. template <class T> -class Property : public PropertyBase { +class CHROME_DBUS_EXPORT Property : public PropertyBase { public: Property() {} @@ -409,81 +409,67 @@ class Property : public PropertyBase { template <> Property<uint8>::Property(); template <> bool Property<uint8>::PopValueFromReader(MessageReader* reader); template <> void Property<uint8>::AppendSetValueToWriter(MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<uint8>; template <> Property<bool>::Property(); template <> bool Property<bool>::PopValueFromReader(MessageReader* reader); template <> void Property<bool>::AppendSetValueToWriter(MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<bool>; template <> Property<int16>::Property(); template <> bool Property<int16>::PopValueFromReader(MessageReader* reader); template <> void Property<int16>::AppendSetValueToWriter(MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<int16>; template <> Property<uint16>::Property(); template <> bool Property<uint16>::PopValueFromReader(MessageReader* reader); template <> void Property<uint16>::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<uint16>; template <> Property<int32>::Property(); template <> bool Property<int32>::PopValueFromReader(MessageReader* reader); template <> void Property<int32>::AppendSetValueToWriter(MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<int32>; template <> Property<uint32>::Property(); template <> bool Property<uint32>::PopValueFromReader(MessageReader* reader); template <> void Property<uint32>::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<uint32>; template <> Property<int64>::Property(); template <> bool Property<int64>::PopValueFromReader(MessageReader* reader); template <> void Property<int64>::AppendSetValueToWriter(MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<int64>; template <> Property<uint64>::Property(); template <> bool Property<uint64>::PopValueFromReader(MessageReader* reader); template <> void Property<uint64>::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<uint64>; template <> Property<double>::Property(); template <> bool Property<double>::PopValueFromReader(MessageReader* reader); template <> void Property<double>::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<double>; template <> bool Property<std::string>::PopValueFromReader( MessageReader* reader); template <> void Property<std::string>::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<std::string>; template <> bool Property<ObjectPath>::PopValueFromReader( MessageReader* reader); template <> void Property<ObjectPath>::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<ObjectPath>; template <> bool Property<std::vector<std::string> >::PopValueFromReader( MessageReader* reader); template <> void Property<std::vector<std::string> >::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<std::vector<std::string> >; template <> bool Property<std::vector<ObjectPath> >::PopValueFromReader( MessageReader* reader); template <> void Property<std::vector<ObjectPath> >::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<std::vector<ObjectPath> >; template <> bool Property<std::vector<uint8> >::PopValueFromReader( MessageReader* reader); template <> void Property<std::vector<uint8> >::AppendSetValueToWriter( MessageWriter* writer); -template class CHROME_DBUS_EXPORT Property<std::vector<uint8> >; } // namespace dbus |