2006-02-01 Chris Toshok <toshok@ximian.com>

	* CompilerCollection.cs: CONFIGURATION_2_0 => NET_2_0.

	* CompilationConfigurationHandler.cs: same.

	* Compiler.cs: same.

	* CompilationConfiguration.cs: same.

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

diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
index e661f1e3c30adac76e5746bb57f58d7826104033..7e310daf90640654c47b75d3df9584f91ead982c 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -1,3 +1,13 @@
+2006-02-01  Chris Toshok  <toshok@ximian.com>
+
+       * CompilerCollection.cs: CONFIGURATION_2_0 => NET_2_0.
+
+       * CompilationConfigurationHandler.cs: same.
+
+       * Compiler.cs: same.
+
+       * CompilationConfiguration.cs: same.
+
 2006-01-08  Konstantin Triger <kostat@mainsoft.com>
 
         * HttpCapabilitiesBase.cs: TARGET_JVM changes to let the compilation

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
index 29b54eeeff2131e05d08c7e99b868cbe00534fb0..0d193a46083458d780627246413113a3055e2150 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
@@ -133,7 +133,7 @@ namespace System.Web.Configuration
                        num_recompiles_before_app_restart = parent.num_recompiles_before_app_restart;
                        strict = parent.strict;
                        temp_directory = parent.temp_directory;
-#if CONFIGURATION_2_0
+#if NET_2_0
                        compilers = new CompilerCollection ();
 #else
                        compilers = new CompilerCollection (parent.compilers);

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
index 6baef7ae2c6c1b54b22ce6b96be24d44e9b1226d..2145a56912b221562d9c6b4cdbe55f8edb67a8cc 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
@@ -99,7 +99,7 @@ namespace System.Web.Configuration
                                compiler.Type = AttValue ("type", child);
                                compiler.CompilerOptions = AttValue ("compilerOptions", child, true, true);
                                compiler.WarningLevel = AttUIntValue ("warningLevel", child, 0);
-#if CONFIGURATION_2_0
+#if NET_2_0
                                config.Compilers.Add (compiler);
 #else
                                config.Compilers [compiler.Language] = compiler;

diff --git a/mcs/class/System.Web/System.Web.Configuration/Compiler.cs b/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
index 3d552295ff1fe23b0383f6754421de2bc086857e..5aa29a50cd0267e5aecc5798222b7519fdb333dc 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
@@ -28,7 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !CONFIGURATION_2_0
+#if !NET_2_0
+/* when NET_2_0 is defined, this class is found in System.Web.Configuration_2.0/ */
 
 using System;
 using System.CodeDom.Compiler;
@@ -37,9 +38,6 @@ using System.Configuration;
 
 namespace System.Web.Configuration
 {
-#if NET_2_0
-       public
-#endif
        class Compiler
        {
                public string Language;

diff --git a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
index 4b6f076d2a12393e85388d0ac666e42bdd95c4d0..78a619b9226508713d63eefd49cac1ecce4517e0 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
@@ -28,7 +28,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !CONFIGURATION_2_0
+#if !NET_2_0
+/* when NET_2_0 is defined, this class is found in System.Web.Configuration_2.0/ */
 
 using System;
 using System.Collections;
@@ -36,9 +37,6 @@ using System.Configuration;
 
 namespace System.Web.Configuration
 {
-#if NET_2_0
-       public
-#endif
        sealed class CompilerCollection
        {
                Hashtable compilers;
@@ -75,4 +73,5 @@ namespace System.Web.Configuration
                }
        }
 }
+
 #endif

diff --git a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
index 81584de3b8b4560f97107ca9904fe93db501dd6a..10fe34fb3ead6ded057e5f6acf57811b902242e1 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
+++ b/mcs/class/System.Web/System.Web.Configuration/WebConfigurationSettings.cs
@@ -811,7 +811,7 @@ namespace System.Web.Configuration
                                ThrowException ("sectionGroup must have a 'name' attribute.", reader);
 
                        string value = null;
-#if CONFIGURATION_2_0
+#if NET_2_0
                        do {
                                if (reader.Name == "name") {
                                        if (value != null)