From f387b457032c484a58c8d56ec9c5fd2eca7851ec Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Fri, 11 Nov 2011 11:33:25 +0100
Subject: [PATCH] update isl for hiding of isl_options

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---
 basis_reduction.c | 9 ++++++---
 isl               | 2 +-
 options.c         | 1 +
 test_bound.c      | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/basis_reduction.c b/basis_reduction.c
index 07b5a6f..d87a044 100644
--- a/basis_reduction.c
+++ b/basis_reduction.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <isl/options.h>
 #include <isl_set_polylib.h>
 #include <barvinok/basis_reduction.h>
 #include <barvinok/options.h>
@@ -31,12 +32,14 @@ Matrix *isl_Polyhedron_Reduced_Basis(Polyhedron *P,
 	isl_basic_set *bset;
 	isl_mat *basis;
 	Matrix *M;
-	int isl_gbr_only_first = options->isl->gbr_only_first;
+	int isl_gbr_only_first;
 
-	options->isl->gbr_only_first = options->gbr_only_first;
 	ctx = isl_ctx_alloc_with_options(&barvinok_options_args, options);
 	assert(ctx);
 
+	isl_gbr_only_first = isl_options_get_gbr_only_first(ctx);
+	isl_options_set_gbr_only_first(ctx, options->gbr_only_first);
+
 	dim = isl_space_set_alloc(ctx, 0, nvar);
 	bset = isl_basic_set_new_from_polylib(P, dim);
 
@@ -57,7 +60,7 @@ Matrix *isl_Polyhedron_Reduced_Basis(Polyhedron *P,
 
 	isl_ctx_free(ctx);
 
-	options->isl->gbr_only_first = isl_gbr_only_first;
+	isl_options_set_gbr_only_first(ctx, isl_gbr_only_first);
 
 	return M;
 }
diff --git a/isl b/isl
index c1e5c89..af52e84 160000
--- a/isl
+++ b/isl
@@ -1 +1 @@
-Subproject commit c1e5c89824b26b40ce10a78c1f61bd1b853ec0f0
+Subproject commit af52e84245fb4bab6734d62da39f63f568371dcd
diff --git a/options.c b/options.c
index 1f6c33f..392f817 100644
--- a/options.c
+++ b/options.c
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <unistd.h>
+#include <isl/options.h>
 #include <barvinok/options.h>
 #include <barvinok/util.h>
 #include "config.h"
diff --git a/test_bound.c b/test_bound.c
index dffec57..cc1750e 100644
--- a/test_bound.c
+++ b/test_bound.c
@@ -2,6 +2,7 @@
 #include <limits.h>
 #include <math.h>
 #include <isl/stream.h>
+#include <isl/options.h>
 #include <barvinok/options.h>
 #include <barvinok/util.h>
 #include "verify.h"
@@ -259,7 +260,7 @@ void handle(FILE *in, struct result_data *result, struct verify_options *options
 	for (j = 0; j < 2; ++j) {
 	    isl_pw_qpolynomial *poly = j == 0 ? upper : lower;
 	    enum isl_fold type = j == 0 ? isl_fold_max : isl_fold_min;
-	    options->barvinok->isl->bound = methods[i].method;
+	    isl_options_set_bound(ctx, methods[i].method);
 	    poly = isl_pw_qpolynomial_copy(poly);
 	    pwf[2*i+j] = isl_pw_qpolynomial_bound(poly, type, NULL);
 	}
-- 
2.11.4.GIT