Made json::value::as_number and json::value::as_string return by const reference instead of by value.

stgates · stgates · commit 260e38cf3a2e · 2015-04-01T18:19:24.000-07:00
diff --git a/Release/include/cpprest/json.h b/Release/include/cpprest/json.h
@@ -471,7 +471,7 @@ namespace json
         /// Throws <see cref="json_exception"/>  if the value is not a number
         /// </summary>
         /// <returns>An instance of number class</returns>
-        _ASYNCRTIMP json::number as_number() const;
+        _ASYNCRTIMP const json::number& as_number() const;
 
         /// <summary>
         /// Converts the JSON value to a C++ bool, if and only if it is a Boolean value.
@@ -509,7 +509,7 @@ namespace json
         /// Converts the JSON value to a C++ STL string, if and only if it is a string value.
         /// </summary>
         /// <returns>A C++ STL string representation of the value</returns>
-        _ASYNCRTIMP utility::string_t as_string() const;
+        _ASYNCRTIMP const utility::string_t& as_string() const;
 
         /// <summary>
         /// Compares two JSON values for equality.
@@ -644,15 +644,13 @@ namespace json
     private:
         std::string _message;
     public:
-        json_exception() {}
         json_exception(const utility::char_t * const &message) : _message(utility::conversions::to_utf8string(message)) { }
 
         // Must be narrow string because it derives from std::exception
         const char* what() const CPPREST_NOEXCEPT
         {
             return _message.c_str();
         }
-        ~json_exception() CPPREST_NOEXCEPT {}
     };
 
     namespace details
@@ -1386,15 +1384,15 @@ namespace json
             virtual bool is_integer() const { throw json_exception(_XPLATSTR("not a number")); }
             virtual bool is_double() const { throw json_exception(_XPLATSTR("not a number")); }
 
-            virtual json::number as_number() { throw json_exception(_XPLATSTR("not a number")); }
+            virtual const json::number& as_number() { throw json_exception(_XPLATSTR("not a number")); }
             virtual double as_double() const { throw json_exception(_XPLATSTR("not a number")); }
             virtual int as_integer() const { throw json_exception(_XPLATSTR("not a number")); }
             virtual bool as_bool() const { throw json_exception(_XPLATSTR("not a boolean")); }
             virtual json::array& as_array() { throw json_exception(_XPLATSTR("not an array")); }
             virtual const json::array& as_array() const { throw json_exception(_XPLATSTR("not an array")); }
             virtual json::object& as_object() { throw json_exception(_XPLATSTR("not an object")); }
             virtual const json::object& as_object() const { throw json_exception(_XPLATSTR("not an object")); }
-            virtual utility::string_t as_string() const { throw json_exception(_XPLATSTR("not a string")); }
+            virtual const utility::string_t& as_string() const { throw json_exception(_XPLATSTR("not a string")); }
 
             virtual size_t size() const { return 0; }
 
@@ -1464,7 +1462,7 @@ namespace json
                 return m_number.to_int32();
             }
 
-            virtual number as_number() { return m_number; }
+            virtual const number& as_number() { return m_number; }
 
         protected:
             virtual void format(std::basic_string<char>& stream) const ;
@@ -1554,7 +1552,7 @@ namespace json
 
             virtual json::value::value_type type() const { return json::value::String; }
 
-            virtual utility::string_t as_string() const;
+            virtual const utility::string_t & as_string() const;
 
             virtual void serialize_impl(std::string& str) const
             {
diff --git a/Release/src/json/json.cpp b/Release/src/json/json.cpp
@@ -262,7 +262,7 @@ web::json::value web::json::value::array(std::vector<value> elements)
             );
 }
 
-web::json::number web::json::value::as_number() const
+const web::json::number& web::json::value::as_number() const
 {
     return m_value->as_number();
 }
diff --git a/Release/src/json/json_serialization.cpp b/Release/src/json/json_serialization.cpp
@@ -255,12 +255,12 @@ void web::json::details::_Number::format(std::basic_string<wchar_t>& stream) con
 
 #endif
 
-utility::string_t web::json::details::_String::as_string() const
+const utility::string_t & web::json::details::_String::as_string() const
 {
     return m_string;
 }
 
-utility::string_t web::json::value::as_string() const
+const utility::string_t & web::json::value::as_string() const
 {
     return m_value->as_string();
 }

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ web::json::value web::json::value::array(std::vector<value> elements)`
`262`	`262`	`);`
`263`	`263`	`}`
`264`	`264`
`265`		`-web::json::number web::json::value::as_number() const`
	`265`	`+const web::json::number& web::json::value::as_number() const`
`266`	`266`	`{`
`267`	`267`	`return m_value->as_number();`
`268`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -255,12 +255,12 @@ void web::json::details::_Number::format(std::basic_string<wchar_t>& stream) con`
`255`	`255`
`256`	`256`	`#endif`
`257`	`257`
`258`		`-utility::string_t web::json::details::_String::as_string() const`
	`258`	`+const utility::string_t & web::json::details::_String::as_string() const`
`259`	`259`	`{`
`260`	`260`	`return m_string;`
`261`	`261`	`}`
`262`	`262`
`263`		`-utility::string_t web::json::value::as_string() const`
	`263`	`+const utility::string_t & web::json::value::as_string() const`
`264`	`264`	`{`
`265`	`265`	`return m_value->as_string();`
`266`	`266`	`}`