Skip to content

Commit

Permalink
Revert of [DBus] Explicitly instantiate dbus::Property variants (http…
Browse files Browse the repository at this point in the history
…s://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
  • Loading branch information
tzik@chromium.org committed Jun 27, 2014
1 parent 6160779 commit 3abb2ec
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions dbus/property.h
Original file line number Diff line number Diff line change
Expand Up @@ -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() {}

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 3abb2ec

Please sign in to comment.