diff options
author | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
---|---|---|
committer | Justin Dickow <jjdickow@gmail.com> | 2015-01-26 11:15:48 -0500 |
commit | 46ed776c537131e72747538488b213cf45f23e22 (patch) | |
tree | 4cad1abf411addfd72ab591c93edeb5d225d9a39 /src/components/rpc_base/include/rpc_base/rpc_base.h | |
parent | a24079cb8de5563376dcf782cdb9fe3cae063841 (diff) | |
download | sdl_core-46ed776c537131e72747538488b213cf45f23e22.tar.gz |
Latest internal release - last bulk merge before pull request and gitflow!?
Smoke tested on Ubuntu 12.04
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Diffstat (limited to 'src/components/rpc_base/include/rpc_base/rpc_base.h')
-rw-r--r-- | src/components/rpc_base/include/rpc_base/rpc_base.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/components/rpc_base/include/rpc_base/rpc_base.h b/src/components/rpc_base/include/rpc_base/rpc_base.h index 6fc55dd588..56b099d9e9 100644 --- a/src/components/rpc_base/include/rpc_base/rpc_base.h +++ b/src/components/rpc_base/include/rpc_base/rpc_base.h @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2014, Ford Motor Company * All rights reserved. * @@ -183,12 +183,10 @@ class Integer : public PrimitiveType { // Methods Integer(); explicit Integer(IntType value); - explicit Integer(const Integer& value); explicit Integer(const Json::Value* value); explicit Integer(dbus::MessageReader* reader); Integer(const Json::Value* value, IntType def_value); Integer& operator=(IntType new_val); - Integer& operator=(const Integer& new_val); Integer& operator++(); Integer& operator+=(int value); operator IntType() const; @@ -231,8 +229,6 @@ class String : public PrimitiveType { String(const Json::Value* value, const std::string& def_value); bool operator<(String new_val); String& operator=(const std::string& new_val); - String& operator=(const String& new_val); - bool operator==(const String& rhs); operator const std::string& () const; Json::Value ToJsonValue() const; void ToDbusWriter(dbus::MessageWriter* writer) const; |