From 6ffff91c543f05687aa4755ae99f33f0f032f06b Mon Sep 17 00:00:00 2001 From: Aaron Jacobs Date: Thu, 26 May 2011 03:27:44 +0000 Subject: [PATCH] Got rid of some unreachable code. --- src/lib_json/json_value.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp index d311288..9c1a994 100644 --- a/src/lib_json/json_value.cpp +++ b/src/lib_json/json_value.cpp @@ -805,7 +805,6 @@ Value::asUInt64() const } JSON_ASSERT_UNREACHABLE; return 0; - return 0; // unreachable; } # endif // if defined(JSON_HAS_INT64) @@ -876,10 +875,8 @@ Value::asFloat() const return 0.0; case booleanValue: return value_.bool_ ? 1.0f : 0.0f; - default: - JSON_FAIL_MESSAGE("Value is not convertible to float."); } - JSON_ASSERT_UNREACHABLE; + JSON_FAIL_MESSAGE("Value is not convertible to float."); return 0.0f; } @@ -898,10 +895,8 @@ Value::asBool() const return value_.uint_ ? true : false; case realValue: return value_.real_ ? true : false; - default: - JSON_FAIL_MESSAGE("Value is not convertible to bool."); } - JSON_ASSERT_UNREACHABLE; + JSON_FAIL_MESSAGE("Value is not convertible to bool."); return false; } @@ -947,8 +942,6 @@ Value::isConvertibleTo( ValueType other ) const case objectValue: return type_ == objectValue || type_ == nullValue; - default: - break; } JSON_ASSERT_UNREACHABLE; return false; @@ -985,9 +978,8 @@ Value::size() const case objectValue: return Int( value_.map_->size() ); #endif - default: - JSON_ASSERT_UNREACHABLE; } + JSON_ASSERT_UNREACHABLE; return 0; // unreachable; }