Changeset 16943 for branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs

Timestamp:

05/11/19 08:14:56 (6 years ago)

Author:

gkronber

Message:

#2994 merge r16933:16942 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.OrTools_version.txt (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.Protobuf.dll (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Plugin.cs.frame (modified) (1 diff)

branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Google.OrTools_version.txt

@@ -3 +3 @@
 GitHub [2]. The library was compiled with Visual Studio 2017 for x64.
 
-[1]: https://github.com/ddorfmeister/or-tools/commit/e13f4bb73f09966332206204d443747e3762555f
+[1]: https://github.com/ddorfmeister/or-tools/commit/eb3d72b09219e1aef48182b77cf26b153e9fc9a1
 [2]: https://github.com/google/or-tools

branches/2994-AutoDiffForIntervals/HeuristicLab.ExtLibs/HeuristicLab.OrTools/7.0.0/HeuristicLab.OrTools-7.0.0/Plugin.cs.frame

@@ -38 +38 @@
   public class HeuristicLabOrToolsPlugin : PluginBase {
 
-    public override void OnUnload() {
-      // HACK: free handle to native DLL used temporarily by the Hive Slave
-      // should be solved for all native DLLs used by the Hive Slave
+    ~HeuristicLabOrToolsPlugin() {
+      // HACK: Free handle to native DLL used temporarily by the Hive Slave.
+      // Finalizer must be used because generated finalizers used in
+      // HeuristicLab.ExactOptimization that call destructors in native DLL
+      // are called after HeuristicLabOrToolsPlugin.OnUnload().
+      // This should be solved for all native DLLs used by the Hive Slave.
       var dllDir = new FileInfo(GetType().Assembly.Location).Directory;
       if (dllDir == null || !dllDir.FullName.Contains(Path.DirectorySeparatorChar + "PluginTemp" + Path.DirectorySeparatorChar))