[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/fc6c7aab4b8d
changeset: 564:fc6c7aab4b8d
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Mar 04 13:43:05 2009 +0000
description:
	Merge

diffstat:

2 files changed, 18 insertions(+)
lemon/glpk.cc |    6 ++++++
lemon/glpk.h  |   12 ++++++++++++

diffs (38 lines):

diff --git a/lemon/glpk.cc b/lemon/glpk.cc
--- a/lemon/glpk.cc
+++ b/lemon/glpk.cc
@@ -522,6 +522,12 @@
     cols.clear();
   }
 
+  void GlpkBase::freeEnv() {
+    glp_free_env();
+  }
+
+  GlpkBase::FreeEnvHelper GlpkBase::freeEnvHelper;
+
   // GlpkLp members
 
   GlpkLp::GlpkLp()
diff --git a/lemon/glpk.h b/lemon/glpk.h
--- a/lemon/glpk.h
+++ b/lemon/glpk.h
@@ -100,6 +100,18 @@
 
     virtual void _clear();
 
+  private:
+
+    static void freeEnv();
+
+    struct FreeEnvHelper {
+      ~FreeEnvHelper() {
+        freeEnv();
+      }
+    };
+    
+    static FreeEnvHelper freeEnvHelper;
+    
   public:
 
     ///Pointer to the underlying GLPK data structure.