2010-02-19 Atsushi Enomoto <atsushi@ximian.com>

	* ServiceContractGenerator.cs : add missing #ifs.

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

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
index 6ad0e9c94aa5d11f8b07fd8821a2c761c38e1a07..c4b39488bebd0a24f35a23cfcb6e8dc8f506fe17 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-19  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * ServiceContractGenerator.cs : add missing #ifs.
+
 2010-02-19  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ServiceContractGenerator.cs, MessagePartDescription.cs,

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs
index f14b7b5f0b942de5b052e81de29348b05b9bdbed..5ff56caf83a95e3a7e41f264b16b2f1c579ba20a 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs
@@ -62,7 +62,9 @@ namespace System.ServiceModel.Description
                ServiceContractGenerationContext contract_context;
                List<OPair> operation_contexts = new List<OPair> ();
 
+#if USE_DATA_CONTRACT_IMPORTER
                XsdDataContractImporter xsd_data_importer;
+#endif
 
                public ServiceContractGenerator ()
                        : this (null, null)
@@ -152,8 +154,10 @@ namespace System.ServiceModel.Description
                        if ((Options & ServiceContractGenerationOptions.ClientClass) != 0)
                                GenerateProxyClass (contractDescription, cns);
 
+#if USE_DATA_CONTRACT_IMPORTER
                        if (xsd_data_importer != null)
                                MergeCompileUnit (xsd_data_importer.CodeCompileUnit, ccu);
+#endif
 
                        // Process extensions. Class first, then methods.
                        // (built-in ones must present before processing class extensions).