Merge pull request #347 from JamesB7/master

[mono.git] / mcs / class / System.Data / System.Data.SqlTypes / SqlNullValueException.cs

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
index 3be1e3463c03ac158ae5a2b24e0939a23812db7d..c7c0468ab21dd085dccff4f9dee68eede3a12400 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
@@ -32,10 +32,9 @@ using System;
 using System.Globalization;
 using System.Runtime.Serialization;
 
-namespace System.Data.SqlTypes {
-       #if NET_1_1
+namespace System.Data.SqlTypes
+{
        [Serializable]
-       #endif  
        public sealed class SqlNullValueException : SqlTypeException, ISerializable
        {
                public SqlNullValueException ()
@@ -48,13 +47,13 @@ namespace System.Data.SqlTypes {
                {
                }
 
-               public SqlNullValueException (string message, Exception inner)
-                       : base (message, inner)
+               public SqlNullValueException (string message, Exception e)
+                       : base (message, e)
                {
                }
 
                private SqlNullValueException (SerializationInfo si, StreamingContext sc) 
-                       : base(si.GetString("SqlNullValueExceptionMessage"))
+                       : base (si.GetString("SqlNullValueExceptionMessage"))
                {
                }