Merge branch 'master' of bitbucket.org:cinderblocks/libremetaverse into appveyorci

This commit is contained in:
Ricky C
2017-03-12 07:56:57 -07:00
6 changed files with 148 additions and 314 deletions

View File

@@ -21,28 +21,24 @@ namespace LitJson
}
internal JsonException (ParserToken token) :
base (String.Format (
"Invalid token '{0}' in input string", token))
base ($"Invalid token '{token}' in input string")
{
}
internal JsonException (ParserToken token,
Exception inner_exception) :
base (String.Format (
"Invalid token '{0}' in input string", token),
base ($"Invalid token '{token}' in input string",
inner_exception)
{
}
internal JsonException (int c) :
base (String.Format (
"Invalid character '{0}' in input string", (char) c))
base ($"Invalid character '{(char) c}' in input string")
{
}
internal JsonException (int c, Exception inner_exception) :
base (String.Format (
"Invalid character '{0}' in input string", (char) c),
base ($"Invalid character '{(char) c}' in input string",
inner_exception)
{
}