generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-17 11:30:13 +02:00
Code Issues Projects Releases Wiki Activity

Fixed more default cases.

Browse Source
This commit is contained in:
Aaron Jacobs 2011-05-26 03:32:11 +00:00
parent 6ffff91c54
commit a9eb1eccc0
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib_json/json_value.cpp
View File

@ -723,9 +723,9 @@ Value::asInt() const
case booleanValue: case booleanValue:
return value_.bool_ ? 1 : 0; return value_.bool_ ? 1 : 0;
default: default:
JSON_FAIL_MESSAGE("Value is not convertible to Int."); break;
} }
JSON_ASSERT_UNREACHABLE; JSON_FAIL_MESSAGE("Value is not convertible to Int.");
return 0; return 0;
} }
@ -749,9 +749,9 @@ Value::asUInt() const
case booleanValue: case booleanValue:
return value_.bool_ ? 1 : 0; return value_.bool_ ? 1 : 0;
default: default:
JSON_FAIL_MESSAGE("Value is not convertible to UInt."); break;
} }
JSON_ASSERT_UNREACHABLE; JSON_FAIL_MESSAGE("Value is not convertible to UInt.");
return 0; return 0;
} }
@ -776,9 +776,9 @@ Value::asInt64() const
case booleanValue: case booleanValue:
return value_.bool_ ? 1 : 0; return value_.bool_ ? 1 : 0;
default: default:
JSON_FAIL_MESSAGE("Value is not convertible to Int64."); break;
} }
JSON_ASSERT_UNREACHABLE; JSON_FAIL_MESSAGE("Value is not convertible to Int64.");
return 0; return 0;
} }
@ -803,7 +803,7 @@ Value::asUInt64() const
default: default:
break; break;
} }
JSON_ASSERT_UNREACHABLE; JSON_FAIL_MESSAGE("Value is not convertible to UInt64.");
return 0; return 0;
} }
# endif // if defined(JSON_HAS_INT64) # endif // if defined(JSON_HAS_INT64)
@ -851,9 +851,10 @@ Value::asDouble() const
case booleanValue: case booleanValue:
return value_.bool_ ? 1.0 : 0.0; return value_.bool_ ? 1.0 : 0.0;
default: default:
JSON_FAIL_MESSAGE("Value is not convertible to double."); break;
} }
return 0; // unreachable; JSON_FAIL_MESSAGE("Value is not convertible to double.");
return 0;
} }
float float
@ -875,6 +876,8 @@ Value::asFloat() const
return 0.0; return 0.0;
case booleanValue: case booleanValue:
return value_.bool_ ? 1.0f : 0.0f; return value_.bool_ ? 1.0f : 0.0f;
default:
break;
} }
JSON_FAIL_MESSAGE("Value is not convertible to float."); JSON_FAIL_MESSAGE("Value is not convertible to float.");
return 0.0f; return 0.0f;
@ -895,6 +898,8 @@ Value::asBool() const
return value_.uint_ ? true : false; return value_.uint_ ? true : false;
case realValue: case realValue:
return value_.real_ ? true : false; return value_.real_ ? true : false;
default:
break;
} }
JSON_FAIL_MESSAGE("Value is not convertible to bool."); JSON_FAIL_MESSAGE("Value is not convertible to bool.");
return false; return false;