Changeset 12515 for branches/HiveStatistics/sources/HeuristicLab.Persistence

Timestamp:

06/25/15 18:21:19 (10 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources/HeuristicLab.Persistence

Files:

• . (modified) (1 prop)
• 3.3/Default/Xml/EasyXmlGenerator.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Persistence/3.3/Default/Xml/EasyXmlGenerator.cs

@@ -167 +167 @@
     /// <param name="obj">The object.</param>
     /// <param name="stream">The stream.</param>
-    public new static void Serialize(object obj, Stream stream) {
+    public static void Serialize(object obj, Stream stream) {
       Serialize(obj, stream, ConfigurationService.Instance.GetConfiguration(new XmlFormat()));
     }
@@ -178 +178 @@
     /// <param name="stream">The stream.</param>
     /// <param name="config">The configuration.</param>
-    public new static void Serialize(object obj, Stream stream, Configuration config) {
+    public static void Serialize(object obj, Stream stream, Configuration config) {
       try {
         using (StreamWriter writer = new StreamWriter(stream)) {