* Decimal.cs [NET_2_0]: Use old code till GMCS imports decimal

constant support.

svn path=/trunk/mcs/; revision=36421

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index c42eeea40cf787f5f28e5ed63642af5753c17512..80c6d49e3bba4e1bba65f26e8dfa7b5e19a9f2ed 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-23  Raja R Harinath  <rharinath@novell.com>
+
+       * Decimal.cs [NET_2_0]: Use old code till GMCS imports decimal
+       constant support.
+
 2004-11-23  Raja R Harinath  <rharinath@novell.com>
 
        * Decimal.cs [BOOTSTRAP_WITH_OLDLIB]: Use old code for compilers

diff --git a/mcs/class/corlib/System/Decimal.cs b/mcs/class/corlib/System/Decimal.cs
index 6121b365f69b017a8f9aa77372b6a78e1233b7f4..7fed5376e1370d48ab23bb13b93f8b098f35217d 100644 (file)
--- a/mcs/class/corlib/System/Decimal.cs
+++ b/mcs/class/corlib/System/Decimal.cs
@@ -56,7 +56,12 @@ namespace System
        IComparable
 #endif
     {
-#if BOOTSTRAP_WITH_OLDLIB
+#if BOOTSTRAP_WITH_OLDLIB || NET_2_0
+
+#if NET_2_0
+#  warning "FIXME: Workaround till Decimal Constant support is merged.  Once it's added, remove this warning and the '|| NET_2_0' above"
+#endif
+
        // LAMESPEC: the attributes aren't mentioned, but show up in CorCompare
        // Unfortunately, corcompare starts throwing security exceptions when
        // these attributes are present...