Changeset 15973 for branches/2522_RefactorPluginInfrastructure/HeuristicLab.Collections/3.3/IndexedItem.cs

Timestamp:

06/28/18 11:13:37 (6 years ago)

Author:

gkronber

Message:

#2522: merged trunk changes from r13402:15972 to branch resolving conflicts where necessary

Location:

branches/2522_RefactorPluginInfrastructure

Files:

• . (modified) (2 props)
• HeuristicLab.Collections/3.3/IndexedItem.cs (modified) (3 diffs)

branches/2522_RefactorPluginInfrastructure

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

branches/2522_RefactorPluginInfrastructure/HeuristicLab.Collections/3.3/IndexedItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
-
 namespace HeuristicLab.Collections {
-  [Serializable]
   public struct IndexedItem<T> {
-    private int index;
+    private readonly int index;
     public int Index {
       get { return index; }
     }
-    private T value;
+    private readonly T value;
     public T Value {
       get { return value; }
@@ -40 +37 @@
 
     public override string ToString() {
-      return "[" + index.ToString() + ": " + value == null ? "null" : value.ToString() + "]";
+      return "[" + index + ": " + (value == null ? "null" : value.ToString()) + "]";
     }
   }

@@ -24 +24 @@
 protoc.exe
 obj
+.vs