Merge pull request #4621 from alexanderkyte/strdup_env

[mono.git] / mcs / class / System.Transactions / System.Transactions / TransactionOptions.cs

diff --git a/mcs/class/System.Transactions/System.Transactions/TransactionOptions.cs b/mcs/class/System.Transactions/System.Transactions/TransactionOptions.cs
index 7496fe455574823f056b32e142b87bb5197fa67e..03fbab0966a6df749f73f95c626963681512dca8 100644 (file)
--- a/mcs/class/System.Transactions/System.Transactions/TransactionOptions.cs
+++ b/mcs/class/System.Transactions/System.Transactions/TransactionOptions.cs
@@ -7,7 +7,6 @@
 // (C)2005 Novell Inc,
 //
 
-#if NET_2_0
 
 namespace System.Transactions
 {
@@ -33,18 +32,18 @@ namespace System.Transactions
                        set { timeout = value; }
                }
 
-               public static bool operator == (TransactionOptions  o1,
-                       TransactionOptions o2)
+               public static bool operator == (TransactionOptions  x,
+                       TransactionOptions y)
                {
-                       return o1.level == o2.level &&
-                               o1.timeout == o2.timeout;
+                       return x.level == y.level &&
+                               x.timeout == y.timeout;
                }
 
-               public static bool operator != (TransactionOptions o1,
-                       TransactionOptions o2)
+               public static bool operator != (TransactionOptions x,
+                       TransactionOptions y)
                {
-                       return o1.level != o2.level ||
-                               o1.timeout != o2.timeout;
+                       return x.level != y.level ||
+                               x.timeout != y.timeout;
                }
 
                public override bool Equals (object obj)
@@ -61,4 +60,3 @@ namespace System.Transactions
        }
 }
 
-#endif