Changeset 538:ba124394367a in lemon-main

Timestamp:

02/23/09 23:44:29 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Automatic GLPK env deallocation (#213)

Files:

• lemon/glpk.cc (modified) (1 diff)
• lemon/glpk.h (modified) (1 diff)
• test/lp_test.cc (modified) (1 diff)
• test/mip_test.cc (modified) (1 diff)

lemon/glpk.cc

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

lemon/glpk.h

@@ -101 +101 @@
     virtual void _clear();
 
-  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.
+  private:
+
     static void freeEnv();
+
+    struct FreeEnvHelper {
+      ~FreeEnvHelper() {
+        freeEnv();
+      }
+    };
+    
+    static FreeEnvHelper freeEnvHelper;
+    
+  public:
 
     ///Pointer to the underlying GLPK data structure.

test/lp_test.cc

@@ -367 +367 @@
     aTest(lp_glpk2);
   }
-  GlpkLp::freeEnv();
 #endif
 

test/mip_test.cc

@@ -116 +116 @@
     aTest(mip1);
   }
-  GlpkLp::freeEnv();
 #endif