X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Flpp%2Flpp_cplex.c;h=d24c8740f4cd94773c978ee3c9c0c4f4f7c27d2d;hb=dcff73b2cc34378750e2cc1979a4b120e19767a9;hp=544e5f8a5ef4f86dbba82b6490929d945d3826c4;hpb=85f517eca982e6a4e1d1848eb67634ae33b70de9;p=libfirm

diff --git a/ir/lpp/lpp_cplex.c b/ir/lpp/lpp_cplex.c
index 544e5f8a5..d24c8740f 100644
--- a/ir/lpp/lpp_cplex.c
+++ b/ir/lpp/lpp_cplex.c
@@ -1,13 +1,29 @@
+/*
+ * Copyright (C) 2005-2011 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
 /**
- * Author:      Daniel Grund
- * Date:        02.06.2005
- * Copyright:   (c) Universitaet Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * @file
+ * @author  Daniel Grund
  */
 #include "config.h"
 
 #ifdef WITH_CPLEX
-
 #include "lpp_cplex.h"
 
 #include <stdio.h>
@@ -153,7 +169,7 @@ static void cpx_construct(cpx_t *cpx)
 	chk_cpx_err(cpx);
 
 	obstack_free(&obst, NULL);
-	free_lpp_matrix(lpp);
+	lpp_free_matrix(lpp);
 }
 
 static void cpx_solve(cpx_t *cpx)
@@ -204,9 +220,9 @@ static void cpx_solve(cpx_t *cpx)
 	// CPXsetintparam (cpx->env, CPX_PARAM_SCRIND, CPX_ON);
 
 	/* solve */
-	timing_ticks(&tvb);
+	timing_ticks(tvb);
 	cpx->status = CPXmipopt(cpx->env, cpx->prob);
-	timing_ticks(&tva);
+	timing_ticks(tva);
 	chk_cpx_err(cpx);
 
 	/* get solution status */