Ticket #213: ba124394367a.patch

lemon/glpk.cc

@@ -526 +526 @@
     glp_free_env();
   }
 
+  GlpkBase::FreeEnvHelper GlpkBase::freeEnvHelper;
+
   // GlpkLp members
 
   GlpkLp::GlpkLp()

lemon/glpk.h

@@ -100 +100 @@
 
     virtual void _clear();
 
+  private:
+
+    static void freeEnv();
+
+    struct FreeEnvHelper {
+      ~FreeEnvHelper() {
+        freeEnv();
+      }
+    };
+    
+    static FreeEnvHelper freeEnvHelper;
+    
   public:
 
-    /// \brief Deallocates the globally allocated memory of GLPK.
-
-    /// Deallocates the globally allocated memory of GLPK.  \note
-    /// Usually, it do not have to be called, because the GLPK use
-    /// only a small amount of global memory, and it is deallocated
-    /// automatically at the end of program.
-    static void freeEnv();
-
     ///Pointer to the underlying GLPK data structure.
     LPX *lpx() {return lp;}
     ///Const pointer to the underlying GLPK data structure.

test/lp_test.cc

@@ -366 +366 @@
     lpTest(lp_glpk1);
     aTest(lp_glpk2);
   }
-  GlpkLp::freeEnv();
 #endif
 
 #ifdef HAVE_CPLEX

test/mip_test.cc

@@ -115 +115 @@
     GlpkMip mip1;
     aTest(mip1);
   }
-  GlpkLp::freeEnv();
 #endif
 
 #ifdef HAVE_CPLEX