Renamed internal ReadOnlyDictionary

roji · roji · commit dd2e6fdcc5ee · 2013-12-27T00:22:01.000+02:00
Renamed our internal ReadOnlyDictionary to
NpgsqlReadOnlyDictionary, to avoid name
conflict with the new .NET 4.5 class
diff --git a/Npgsql/Npgsql/NpgsqlConnector.cs b/Npgsql/Npgsql/NpgsqlConnector.cs
@@ -1221,7 +1221,7 @@ public void AddParameterStatus(NpgsqlParameterStatus ps)
 
         public IDictionary<string, NpgsqlParameterStatus> ServerParameters
         {
-            get { return new ReadOnlyDictionary<string, NpgsqlParameterStatus>(_serverParameters); }
+            get { return new NpgsqlReadOnlyDictionary<string, NpgsqlParameterStatus>(_serverParameters); }
         }
     }
 }
diff --git a/Npgsql/Npgsql/PGUtil.cs b/Npgsql/Npgsql/PGUtil.cs
@@ -908,11 +908,11 @@ internal enum FormatCode :
         Binary = 1
     }
 
-    internal class ReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>
+    internal class NpgsqlReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>
     {
         private readonly Dictionary<TKey, TValue> _inner;
 
-        public ReadOnlyDictionary(Dictionary<TKey, TValue> inner)
+        public NpgsqlReadOnlyDictionary(Dictionary<TKey, TValue> inner)
         {
             _inner = inner;
         }

Original file line number	Diff line number	Diff line change
`@@ -1221,7 +1221,7 @@ public void AddParameterStatus(NpgsqlParameterStatus ps)`
`1221`	`1221`
`1222`	`1222`	`public IDictionary<string, NpgsqlParameterStatus> ServerParameters`
`1223`	`1223`	`{`
`1224`		`- get { return new ReadOnlyDictionary<string, NpgsqlParameterStatus>(_serverParameters); }`
	`1224`	`+ get { return new NpgsqlReadOnlyDictionary<string, NpgsqlParameterStatus>(_serverParameters); }`
`1225`	`1225`	`}`
`1226`	`1226`	`}`
`1227`	`1227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -908,11 +908,11 @@ internal enum FormatCode :`
`908`	`908`	`Binary = 1`
`909`	`909`	`}`
`910`	`910`
`911`		`- internal class ReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>`
	`911`	`+ internal class NpgsqlReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>`
`912`	`912`	`{`
`913`	`913`	`private readonly Dictionary<TKey, TValue> _inner;`
`914`	`914`
`915`		`- public ReadOnlyDictionary(Dictionary<TKey, TValue> inner)`
	`915`	`+ public NpgsqlReadOnlyDictionary(Dictionary<TKey, TValue> inner)`
`916`	`916`	`{`
`917`	`917`	`_inner = inner;`
`918`	`918`	`}`