Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/Newtonsoft.Json.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/Src
diff options
context:
space:
mode:
authorJamesNK <james@newtonking.com>2011-10-01 16:11:51 +0400
committerJamesNK <james@newtonking.com>2011-10-01 16:11:51 +0400
commitea2897c1b30303df8f2ddf6b88ab2b2062c37d16 (patch)
treef8435611223d869694678754116f1db7bebbb237 /Src
parent4f947d9207ac1d67384c9b25a1332b62fdfc9bae (diff)
-Clean up compiler warnings
Diffstat (limited to 'Src')
-rw-r--r--Src/Newtonsoft.Json/JsonWriter.cs6
-rw-r--r--Src/Newtonsoft.Json/Linq/JArray.cs4
-rw-r--r--Src/Newtonsoft.Json/Linq/JConstructor.cs4
-rw-r--r--Src/Newtonsoft.Json/Linq/JContainer.cs8
-rw-r--r--Src/Newtonsoft.Json/Linq/JObject.cs4
-rw-r--r--Src/Newtonsoft.Json/Linq/JProperty.cs4
-rw-r--r--Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs6
7 files changed, 33 insertions, 3 deletions
diff --git a/Src/Newtonsoft.Json/JsonWriter.cs b/Src/Newtonsoft.Json/JsonWriter.cs
index 0db37e9..03ac0b2 100644
--- a/Src/Newtonsoft.Json/JsonWriter.cs
+++ b/Src/Newtonsoft.Json/JsonWriter.cs
@@ -353,16 +353,16 @@ namespace Newtonsoft.Json
WriteComment(reader.Value.ToString());
break;
case JsonToken.Integer:
- WriteValue(Convert.ToInt64(reader.Value));
+ WriteValue(Convert.ToInt64(reader.Value, CultureInfo.InvariantCulture));
break;
case JsonToken.Float:
- WriteValue(Convert.ToDouble(reader.Value));
+ WriteValue(Convert.ToDouble(reader.Value, CultureInfo.InvariantCulture));
break;
case JsonToken.String:
WriteValue(reader.Value.ToString());
break;
case JsonToken.Boolean:
- WriteValue(Convert.ToBoolean(reader.Value));
+ WriteValue(Convert.ToBoolean(reader.Value, CultureInfo.InvariantCulture));
break;
case JsonToken.Null:
WriteNull();
diff --git a/Src/Newtonsoft.Json/Linq/JArray.cs b/Src/Newtonsoft.Json/Linq/JArray.cs
index 39cfd33..1c5ff74 100644
--- a/Src/Newtonsoft.Json/Linq/JArray.cs
+++ b/Src/Newtonsoft.Json/Linq/JArray.cs
@@ -41,6 +41,10 @@ namespace Newtonsoft.Json.Linq
{
private IList<JToken> _values = new List<JToken>();
+ /// <summary>
+ /// Gets the container's children tokens.
+ /// </summary>
+ /// <value>The container's children tokens.</value>
protected override IList<JToken> ChildrenTokens
{
get { return _values; }
diff --git a/Src/Newtonsoft.Json/Linq/JConstructor.cs b/Src/Newtonsoft.Json/Linq/JConstructor.cs
index 9b0175f..c2e0c5d 100644
--- a/Src/Newtonsoft.Json/Linq/JConstructor.cs
+++ b/Src/Newtonsoft.Json/Linq/JConstructor.cs
@@ -40,6 +40,10 @@ namespace Newtonsoft.Json.Linq
private string _name;
private IList<JToken> _values = new List<JToken>();
+ /// <summary>
+ /// Gets the container's children tokens.
+ /// </summary>
+ /// <value>The container's children tokens.</value>
protected override IList<JToken> ChildrenTokens
{
get { return _values; }
diff --git a/Src/Newtonsoft.Json/Linq/JContainer.cs b/Src/Newtonsoft.Json/Linq/JContainer.cs
index fd077b8..01bda6e 100644
--- a/Src/Newtonsoft.Json/Linq/JContainer.cs
+++ b/Src/Newtonsoft.Json/Linq/JContainer.cs
@@ -67,6 +67,10 @@ namespace Newtonsoft.Json.Linq
public event NotifyCollectionChangedEventHandler CollectionChanged;
#endif
+ /// <summary>
+ /// Gets the container's children tokens.
+ /// </summary>
+ /// <value>The container's children tokens.</value>
protected abstract IList<JToken> ChildrenTokens { get; }
private object _syncRoot;
@@ -865,6 +869,10 @@ namespace Newtonsoft.Json.Linq
CopyItemsTo(array, index);
}
+ /// <summary>
+ /// Gets the count of child JSON tokens.
+ /// </summary>
+ /// <value>The count of child JSON tokens</value>
public int Count
{
get { return ChildrenTokens.Count; }
diff --git a/Src/Newtonsoft.Json/Linq/JObject.cs b/Src/Newtonsoft.Json/Linq/JObject.cs
index fab78d5..3091c0f 100644
--- a/Src/Newtonsoft.Json/Linq/JObject.cs
+++ b/Src/Newtonsoft.Json/Linq/JObject.cs
@@ -85,6 +85,10 @@ namespace Newtonsoft.Json.Linq
private JPropertKeyedCollection _properties = new JPropertKeyedCollection(StringComparer.Ordinal);
+ /// <summary>
+ /// Gets the container's children tokens.
+ /// </summary>
+ /// <value>The container's children tokens.</value>
protected override IList<JToken> ChildrenTokens
{
get { return _properties; }
diff --git a/Src/Newtonsoft.Json/Linq/JProperty.cs b/Src/Newtonsoft.Json/Linq/JProperty.cs
index 7749629..3487ab1 100644
--- a/Src/Newtonsoft.Json/Linq/JProperty.cs
+++ b/Src/Newtonsoft.Json/Linq/JProperty.cs
@@ -43,6 +43,10 @@ namespace Newtonsoft.Json.Linq
private readonly List<JToken> _content = new List<JToken>();
private readonly string _name;
+ /// <summary>
+ /// Gets the container's children tokens.
+ /// </summary>
+ /// <value>The container's children tokens.</value>
protected override IList<JToken> ChildrenTokens
{
get { return _content; }
diff --git a/Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs b/Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs
index 798b9db..9f0176a 100644
--- a/Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs
+++ b/Src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs
@@ -118,6 +118,12 @@ namespace Newtonsoft.Json.Serialization
}
#if !(NET35 || NET20)
+ /// <summary>
+ /// When overridden in a derived class, controls the binding of a serialized object to a type.
+ /// </summary>
+ /// <param name="serializedType">The type of the object the formatter creates a new instance of.</param>
+ /// <param name="assemblyName">Specifies the <see cref="T:System.Reflection.Assembly"/> name of the serialized object. </param>
+ /// <param name="typeName">Specifies the <see cref="T:System.Type"/> name of the serialized object. </param>
public override void BindToName(Type serializedType, out string assemblyName, out string typeName)
{
#if !SILVERLIGHT