From f227b25e85474f8ae14a6133f1424058f05798be Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 3 Mar 2019 12:23:08 +0100 Subject: [PATCH] Revert "Added const to overloaded operators." This reverts commit 2103eb4ac2394b674c5cec2e935533d557c8c275. --- src/easy/easy.cpp | 7 +++---- src/easy/easy.hpp | 8 ++++---- src/mastodon-cpp.cpp | 9 ++++----- src/mastodon-cpp.hpp | 10 +++++----- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/easy/easy.cpp b/src/easy/easy.cpp index 75a6b12..1f725fd 100644 --- a/src/easy/easy.cpp +++ b/src/easy/easy.cpp @@ -36,18 +36,17 @@ return_entity::return_entity(const uint8_t ec, const string &em, error_message = em; } -const return_entity::operator const Easy::GenericEntity() const +return_entity::operator const Easy::GenericEntity() const { return entity; } -const return_entity::operator const string() const +return_entity::operator const string() const { return entity.to_string(); } -const std::ostream &Mastodon::operator <<(std::ostream &out, - const return_entity &ret) +std::ostream &Mastodon::operator <<(std::ostream &out, const return_entity &ret) { out << ret.entity.to_string(); return out; diff --git a/src/easy/easy.hpp b/src/easy/easy.hpp index 73f768d..0e14aa7 100644 --- a/src/easy/easy.hpp +++ b/src/easy/easy.hpp @@ -550,10 +550,10 @@ typedef struct return_entity : return_base return_entity(const uint8_t ec, const string &em, const Easy::GenericEntity &ent); - const operator const Easy::GenericEntity() const; - const operator const string() const; - friend const std::ostream &operator <<(std::ostream &out, - const return_entity &ret); + operator const Easy::GenericEntity() const; + operator const string() const; + friend std::ostream &operator <<(std::ostream &out, + const return_entity &ret); } return_entity; /*! diff --git a/src/mastodon-cpp.cpp b/src/mastodon-cpp.cpp index 5141a5e..2d7e4bf 100644 --- a/src/mastodon-cpp.cpp +++ b/src/mastodon-cpp.cpp @@ -26,7 +26,7 @@ #include using namespace Mastodon; -const return_base::operator const bool() const +return_base::operator const bool() const { if (error_code == 0) { @@ -38,18 +38,17 @@ const return_base::operator const bool() const } } -const return_base::operator const uint8_t() const +return_base::operator const uint8_t() const { return error_code; } -const return_call::operator const string() const +return_call::operator const string() const { return answer; } -const std::ostream &Mastodon::operator <<(std::ostream &out, - const return_call &ret) +std::ostream &Mastodon::operator <<(std::ostream &out, const return_call &ret) { out << ret.answer; return out; diff --git a/src/mastodon-cpp.hpp b/src/mastodon-cpp.hpp index 5a139c8..600e539 100644 --- a/src/mastodon-cpp.hpp +++ b/src/mastodon-cpp.hpp @@ -47,8 +47,8 @@ namespace Mastodon uint8_t error_code = 0; // NOTE: http://mazack.org/unix/errno.php string error_message; - const operator const bool() const; - const operator const uint8_t() const; + operator const bool() const; + operator const uint8_t() const; } return_base; /*! @@ -64,9 +64,9 @@ namespace Mastodon return_call(const uint8_t ec, const string &em, const uint16_t hec, const string &a); - const operator const string() const; - friend const std::ostream &operator <<(std::ostream &out, - const return_call &ret); + operator const string() const; + friend std::ostream &operator <<(std::ostream &out, + const return_call &ret); } return_call; /*!