remove old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

diff --git a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild b/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
deleted file mode 100644 (file)
index 3179b54..0000000
--- a/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/4ti2-1.3.2-r1.ebuild,v 1.9 2013/07/27 22:22:12 ago Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
-HOMEPAGE="http://www.4ti2.de/"
-SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE="static-libs"
-
-DEPEND="
-       sci-mathematics/glpk:0[gmp]
-       dev-libs/gmp[cxx]"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-       "${FILESDIR}"/${P}-gold.patch
-       "${FILESDIR}"/${P}-gcc47.patch
-       )
-
-src_prepare() {
-       sed \
-               -e "s:^CXX.*$:CXX=$(tc-getCXX):g" \
-               -i m4/glpk-check.m4 || die
-       autotools-utils_src_prepare
-}

diff --git a/sci-mathematics/4ti2/ChangeLog b/sci-mathematics/4ti2/ChangeLog
index f9bec7724f767a0112697dd5d62a81d2005c32f3..ffaeb37f4834391659da2e170759248df8edadf9 100644 (file)
--- a/sci-mathematics/4ti2/ChangeLog
+++ b/sci-mathematics/4ti2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/4ti2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.19 2015/03/22 11:17:18 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/4ti2/ChangeLog,v 1.20 2015/03/22 13:08:28 tomka Exp $
+
+  22 Mar 2015; Thomas Kahle <tomka@gentoo.org> -4ti2-1.3.2-r1.ebuild,
+  -files/4ti2-1.3.2-gcc47.patch:
+  remove old
 
   22 Mar 2015; Andreas Schuerch <nativemad@gentoo.org> 4ti2-1.6.2.ebuild:
   x86 stable, see bug 511442

diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index 5594670bdd8fc9de20d1ce864a2a0871fbfa2da6..5ea09208bc690965baedb4d0f60e6c2909d1edbf 100644 (file)
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -1,28 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 4ti2-1.3.2-gcc47.patch 17244 SHA256 b800834f1736e53dea2798b7ddaf407dfc8152fc2f8a1d313de542f381b0bcd5 SHA512 c8fba131c687d3676097c33091c6619128f0fe3a2f5f38bf3d4be2d3adf53f03e2fa3e81bcc9ebdc59a9843028294463ffdf808904e4f8e446bb2ae6eaa8b619 WHIRLPOOL 732d7157bd7e5e4a83465895fc967d745642609854256ec7eccae558babe9d06d29ab150f7f6c75d3c954cfa69c1770ce4f237862f3b18699844724bfcd7d635
 AUX 4ti2-1.3.2-gold.patch 652 SHA256 50ebe74bb3fc8c0863a12823e52f4dc9d1fe7ab6e8674d53453adb5fd8460601 SHA512 60b14d7b287b69adbce420f37dad5d83ce21bfa4329ea0810c67f054d35a71f6795b0a8206b268ec9cfa08f796a4cd80a34d816c691e8e3e77adcbc5217b43a7 WHIRLPOOL ac0358e169846be7ac75380d69752f24b8bd5e9a68e4ad59abc840fcf86c6998f76df37888cf305ab2c4bf8b96dd2ce566f13a434f0522f377f8feb337b1e22b
-DIST 4ti2-1.3.2.tar.gz 4658600 SHA256 30f15696105b5cfa0784d2f7f9a310ef67d616d2367e064c85ba36ec9a20a066 SHA512 f5d76ed8405e34d2d27138343c59d32bc212528491e89e996bfc54e9a5ebd67eeb63b2a606b5e94c16ed83df1ea96e78346f16d9d432e2a28cd39aff807b8687 WHIRLPOOL b7aa50b94ff4cdd3237ee965c72a2f6f36c6cb7e8b0bffcdf00c45e93f49c224348336b3e12615bf8bfefda4429a8fc98593b08c94712ad5ed2100ed555eb3b6
 DIST 4ti2-1.6.2.tar.gz 5531651 SHA256 e1b39c5c051904e41deefce5419b16d723b1f403c616ddd6e3610e260d4b5711 SHA512 ff68f767b8677ce0ce94cca39fa3ef87835d77a951f0ec6ae28ab171bf09ae25c551d88c2cdf5bf3115b33bd32366b063533a1c22576130a00f542f9370bcd7b WHIRLPOOL f125cee526f8d2693b01978fd39cc36c900e7611ac0b8026f33c68ec8ccb0bb29cdffdf5c11adc6a5f7041389d34e6cacff173437c4be725c9b390a25e24e397
-EBUILD 4ti2-1.3.2-r1.ebuild 830 SHA256 6e0f0f52285bbefb549456cc43b9230fb84756e9ce83705ec6da7b4f0b86045b SHA512 781520d44106459a06e27a619d0ad60573f9f5c70a6bf7a68b6731a2e49480b36527609760cbf56500f54bbf0a9cd24ded573219eeacaec7678317df7a3ce314 WHIRLPOOL 15171efd854ab620b1b44781ee93aa94d331f5ca8e44b888804e90aac10a8323643e574dff6290f05b669be237d2578d3b30312689620ced47a4c1a3feae060f
 EBUILD 4ti2-1.6.2.ebuild 905 SHA256 aabf7740a75c700147b24d849fb8a41d7a354461f907d4d4bdb49996b006d2f3 SHA512 fe8b1c4a41eb4015d624bcd35c872ceea466eb1dc4ec2ecd35bd8891f7c39d11ff4ae1aeb3070e1206d083807188d253291b0c874f0063729e2eb8d3ef763514 WHIRLPOOL fdcbebdf349b4761a9316b69e2d98e3d02d8afe11f283a0d8a2980a6a2ee4f3cf3da7270be1cdfe4768510749eea998d6831fa8d46b2aca3f9b90399a0e6a433
-MISC ChangeLog 2999 SHA256 d1053ef8c3ac52993917ce3b1e7f1ebf1f6c7583215973c6c45ecc49d0dd7445 SHA512 bf0c31ce5b823593cd85d6ca77613e48f4b2edb5181217e553d12b4eda7c11846d72cfa874e67526ac1c11412c196e9bd3c315f159a68064967dde7905de5e0e WHIRLPOOL 48b32e745267a47a99436d71c517fa2e0fca21491a2010000164760c707c0e0fd8e1ea261184fd78e88911aac778523e3bae29732130bdc0400f145e33888acd
+MISC ChangeLog 3112 SHA256 ac0f5a25718c1356705544ff92772381173b3449628ff8597a5fbe62d66694b4 SHA512 93df07647c9d46efb352bc7f83f5e12118b55bcbaf78d036d952870bfedb0fc4aed9f844baaaaa064a4657ff69cac37eb07870e91682829ddaa10805afbc87d0 WHIRLPOOL f128aa07a166d039583f647e9c8339253d30363a8a77fe7a160fff3c83f4e76fc3a7dcaca5a0708202f9eb5482fc2abd5a92f30cfaf7307fb65962a81defba84
 MISC metadata.xml 438 SHA256 1de19f430f262df930f1ddca59bbbf5820f7577418b4d737fc4a18843f89aac9 SHA512 db6751ece76934b154b36460eb1f71053a3b23dee607114a5e89e878a9f93d751cf6fdc58673f1d0583f6e80aafa358c7d8faa30863a333b0a908d7c254acbde WHIRLPOOL 279b1d05932c3eba7030d0051285ae0472545b619b26e07b221652bb732e998d45f8f7c9f16b7d9ec6e2ffa377fffd12618481949701872cd49c714c9be53d99
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVDqQ0AAoJEIug43o+kWudUQMP/jE9Gz3zA69iXW+PlW8kHXcD
-NBchCKwkJQYBcr2CyXuS9emLxWL2fYTyn5hgg1DlNucVWYntGZnANm9yVeG9JIma
-THnykQrZG2LFucMcbY3BBn1kM57zZu/uCZrr9p5uPptnUgxzTPrFXLFdNrdZbzls
-EgqzY2Qz5uLWzbKzwEnPLP8etJpF/qt9+rJMzTmR2OiH3MI60SDdGO9k+5jTP70u
-VvoZ2C+uLxK7cmc6Zu2sB89Ea94EPbCPzCr+dVNxGN+QjzpQimp2QhQn4fU0Ro4S
-DOcJluJ/AhhkkdaT7bbLTyZLNIHSpoiEYPud8/bj/C3TJ2Px+W2UOc0Dl+rzU/Gu
-COiAP7TSYWuGlT6P7gi0VgNyJyjRgUrDHAZHBBryb3QGHTGMOVQxCqZ8bz00gbg6
-C/1v01AdHv8H6kGpj66TNyIFHQBlWoplkOoXQiHuVJLQEi41C5PIuhsc1fHDn74V
-zonmxg/Cm9FcI5ggibJxeNtZCsBS3lDFZn/I6aYUbDYxbaS084HD9Ww74+swtIY0
-o35FX+QsJOFEeJoBG1Vt5Y5TrEEWvKIoioUO1YS8c+1t+SzkzWpljjW6avvQr1kt
-Hhmuv5MXzyBtriaDIY4eOmBRyI08lHp37ET4MaiyapeqifoE+iiX3OQNCoCAUPgo
-+qN/Qh/jOFaVbdsnH/hE
-=mWis
------END PGP SIGNATURE-----

diff --git a/sci-mathematics/4ti2/files/4ti2-1.3.2-gcc47.patch b/sci-mathematics/4ti2/files/4ti2-1.3.2-gcc47.patch
deleted file mode 100644 (file)
index f9c8849..0000000
--- a/sci-mathematics/4ti2/files/4ti2-1.3.2-gcc47.patch
+++ /dev/null
@@ -1,282 +0,0 @@
- src/groebner/CircuitMatrixAlgorithm.tpp  |   28 +++++++++++-----------
- src/groebner/CircuitSupportAlgorithm.tpp |   36 +++++++++++++++---------------
- src/groebner/RayMatrixAlgorithm.tpp      |   14 +++++-----
- src/groebner/RaySupportAlgorithm.tpp     |   14 +++++-----
- 4 files changed, 46 insertions(+), 46 deletions(-)
-
-diff --git a/src/groebner/CircuitMatrixAlgorithm.tpp b/src/groebner/CircuitMatrixAlgorithm.tpp
-index 9bb650f..48b2103 100644
---- a/src/groebner/CircuitMatrixAlgorithm.tpp
-+++ b/src/groebner/CircuitMatrixAlgorithm.tpp
-@@ -152,23 +152,23 @@ CircuitMatrixAlgorithm<IndexSet>::compute1(
-         )
- 
-         // Find the next column.
--        Index next_col = next_column(vs, remaining);
-+        Index next_col = this->next_column(vs, remaining);
- 
-         int start = 0; int end = vs.get_number(); int middle;
-         // We sort the vectors into nonzeros and then zeros.
--        sort_nonzeros(vs, start, end, rays, supps, pos_supps, neg_supps, next_col, middle);
-+        this->sort_nonzeros(vs, start, end, rays, supps, pos_supps, neg_supps, next_col, middle);
-         int nonzero_start = start, nonzero_end = middle;
-         //int zero_start = middle, zero_end = end;
-         // We sort the nonzeros into rays and circuits.
--        sort_rays(vs, nonzero_start, nonzero_end, rays, supps, pos_supps, neg_supps, middle);
-+        this->sort_rays(vs, nonzero_start, nonzero_end, rays, supps, pos_supps, neg_supps, middle);
-         int ray_start = nonzero_start, ray_end = middle;
-         int cir_start = middle, cir_end = nonzero_end;
-         // We sort the rays into positives and then negatives.
--        sort_positives(vs, ray_start, ray_end, supps, pos_supps, neg_supps, next_col, middle);
-+        this->sort_positives(vs, ray_start, ray_end, supps, pos_supps, neg_supps, next_col, middle);
-         int pos_ray_start = ray_start, pos_ray_end = middle;
-         int neg_ray_start = middle, neg_ray_end = ray_end;
-         // We sort the circuits into positives and then negatives.
--        sort_positives(vs, cir_start, cir_end, supps, pos_supps, neg_supps, next_col, middle);
-+        this->sort_positives(vs, cir_start, cir_end, supps, pos_supps, neg_supps, next_col, middle);
-         int pos_cir_start = cir_start, pos_cir_end = middle;
-         int neg_cir_start = middle, neg_cir_end = cir_end;
- 
-@@ -185,8 +185,8 @@ CircuitMatrixAlgorithm<IndexSet>::compute1(
- 
-         // Switch the positive and negative supports, so that it is as if all
-         // vectors have a positive entry in the next column.
--        switch_supports(neg_ray_start, neg_ray_end, pos_supps, neg_supps);
--        switch_supports(neg_cir_start, neg_cir_end, pos_supps, neg_supps);
-+        this->switch_supports(neg_ray_start, neg_ray_end, pos_supps, neg_supps);
-+        this->switch_supports(neg_cir_start, neg_cir_end, pos_supps, neg_supps);
- 
-         matrix = orig_matrix;
-         int remaining_row = upper_triangle(matrix, remaining, 0);
-@@ -212,15 +212,15 @@ CircuitMatrixAlgorithm<IndexSet>::compute1(
-         rays.insert(rays.end(), vs.get_number()-previous_size, false);
- 
-         // Switch back the positive and negative supports.
--        switch_supports(neg_ray_start, neg_ray_end, pos_supps, neg_supps);
--        switch_supports(neg_cir_start, neg_cir_end, pos_supps, neg_supps);
-+        this->switch_supports(neg_ray_start, neg_ray_end, pos_supps, neg_supps);
-+        this->switch_supports(neg_cir_start, neg_cir_end, pos_supps, neg_supps);
- 
-         // Update the supp vectors for the next_col.
--        update_supports(supps, next_col, nonzero_start, nonzero_end);
--        update_supports(pos_supps, next_col, pos_ray_start, pos_ray_end);
--        update_supports(pos_supps, next_col, pos_cir_start, pos_cir_end);
--        update_supports(neg_supps, next_col, neg_ray_start, neg_ray_end);
--        update_supports(neg_supps, next_col, neg_cir_start, neg_cir_end);
-+        this->update_supports(supps, next_col, nonzero_start, nonzero_end);
-+        this->update_supports(pos_supps, next_col, pos_ray_start, pos_ray_end);
-+        this->update_supports(pos_supps, next_col, pos_cir_start, pos_cir_end);
-+        this->update_supports(neg_supps, next_col, neg_ray_start, neg_ray_end);
-+        this->update_supports(neg_supps, next_col, neg_cir_start, neg_cir_end);
- 
-         *out << "\r";
-         *out << "  Left = " << std::setw(3) << num_remaining;
-diff --git a/src/groebner/CircuitSupportAlgorithm.tpp b/src/groebner/CircuitSupportAlgorithm.tpp
-index 07de9aa..e956417 100644
---- a/src/groebner/CircuitSupportAlgorithm.tpp
-+++ b/src/groebner/CircuitSupportAlgorithm.tpp
-@@ -188,23 +188,23 @@ CircuitSupportAlgorithm<IndexSet>::compute1(
-         )
-  
-         // Find the next column.
--        Index next_col = next_column(vs, remaining);
-+        Index next_col = this->next_column(vs, remaining);
- 
-         int start = 0; int end = vs.get_number(); int middle;
-         // We sort the vectors into nonzeros and then zeros.
--        sort_nonzeros(vs, start, end, rays, supps, pos_supps, neg_supps, next_col, middle);
-+        this->sort_nonzeros(vs, start, end, rays, supps, pos_supps, neg_supps, next_col, middle);
-         int nonzero_start = start, nonzero_end = middle;
-         //int zero_start = middle, zero_end = end;
-         // We sort the nonzeros into rays and circuits.
--        sort_rays(vs, nonzero_start, nonzero_end, rays, supps, pos_supps, neg_supps, middle);
-+        this->sort_rays(vs, nonzero_start, nonzero_end, rays, supps, pos_supps, neg_supps, middle);
-         int ray_start = nonzero_start, ray_end = middle;
-         int cir_start = middle, cir_end = nonzero_end;
-         // We sort the rays into positives and then negatives.
--        sort_positives(vs, ray_start, ray_end, supps, pos_supps, neg_supps, next_col, middle);
-+        this->sort_positives(vs, ray_start, ray_end, supps, pos_supps, neg_supps, next_col, middle);
-         int pos_ray_start = ray_start, pos_ray_end = middle;
-         int neg_ray_start = middle, neg_ray_end = ray_end;
-         // We sort the circuits into positives and the negatives.
--        sort_positives(vs, cir_start, cir_end, supps, pos_supps, neg_supps, next_col, middle);
-+        this->sort_positives(vs, cir_start, cir_end, supps, pos_supps, neg_supps, next_col, middle);
-         int pos_cir_start = cir_start, pos_cir_end = middle;
-         int neg_cir_start = middle, neg_cir_end = cir_end;
- 
-@@ -233,8 +233,8 @@ CircuitSupportAlgorithm<IndexSet>::compute1(
- 
-         // Switch the positive and negative supports, so that it is as if all
-         // vectors have a positive entry in the next column.
--        switch_supports(neg_ray_start, neg_ray_end, pos_supps, neg_supps);
--        switch_supports(neg_cir_start, neg_cir_end, pos_supps, neg_supps);
-+        this->switch_supports(neg_ray_start, neg_ray_end, pos_supps, neg_supps);
-+        this->switch_supports(neg_cir_start, neg_cir_end, pos_supps, neg_supps);
- 
-         //DEBUG_4ti2(*out << "Remaining row " << remaining_row << "\n";)
-         int previous_size = vs.get_number();
-@@ -258,19 +258,19 @@ CircuitSupportAlgorithm<IndexSet>::compute1(
-         rays.insert(rays.end(), vs.get_number()-previous_size, false);
- 
-         // Switch back the positive and negative supports.
--        switch_supports(neg_ray_start, neg_ray_end, pos_supps, neg_supps);
--        switch_supports(neg_cir_start, neg_cir_end, pos_supps, neg_supps);
-+        this->switch_supports(neg_ray_start, neg_ray_end, pos_supps, neg_supps);
-+        this->switch_supports(neg_cir_start, neg_cir_end, pos_supps, neg_supps);
- 
-         // Update the supp vectors for the next_col.
--        update_supports(supps, next_col, nonzero_start, nonzero_end);
--        update_supports(pos_supps, next_col, pos_ray_start, pos_ray_end);
--        update_supports(pos_supps, next_col, pos_cir_start, pos_cir_end);
--        update_supports(pos_supps, col_map[next_col], neg_ray_start, neg_ray_end);
--        update_supports(pos_supps, col_map[next_col], neg_cir_start, neg_cir_end);
--        update_supports(neg_supps, next_col, neg_ray_start, neg_ray_end);
--        update_supports(neg_supps, next_col, neg_cir_start, neg_cir_end);
--        update_supports(neg_supps, col_map[next_col], pos_ray_start, pos_ray_end);
--        update_supports(neg_supps, col_map[next_col], pos_cir_start, pos_cir_end);
-+        this->update_supports(supps, next_col, nonzero_start, nonzero_end);
-+        this->update_supports(pos_supps, next_col, pos_ray_start, pos_ray_end);
-+        this->update_supports(pos_supps, next_col, pos_cir_start, pos_cir_end);
-+        this->update_supports(pos_supps, col_map[next_col], neg_ray_start, neg_ray_end);
-+        this->update_supports(pos_supps, col_map[next_col], neg_cir_start, neg_cir_end);
-+        this->update_supports(neg_supps, next_col, neg_ray_start, neg_ray_end);
-+        this->update_supports(neg_supps, next_col, neg_cir_start, neg_cir_end);
-+        this->update_supports(neg_supps, col_map[next_col], pos_ray_start, pos_ray_end);
-+        this->update_supports(neg_supps, col_map[next_col], pos_cir_start, pos_cir_end);
- 
-         *out << "\r";
-         *out << "  Left = " << std::setw(3) << num_remaining;
-diff --git a/src/groebner/RayMatrixAlgorithm.tpp b/src/groebner/RayMatrixAlgorithm.tpp
-index 346248e..75c202a 100644
---- a/src/groebner/RayMatrixAlgorithm.tpp
-+++ b/src/groebner/RayMatrixAlgorithm.tpp
-@@ -865,7 +865,7 @@ RayMatrixAlgorithm<IndexSet>::compute3(
-         DEBUG_4ti2(unsigned long long int num_checks = 0;)
-         // Find the next column.
-         int next_positive_count, next_negative_count, next_zero_count;
--        Index next_col = next_column(vs, remaining,
-+        Index next_col = this->next_column(vs, remaining,
-                                         next_positive_count,
-                                         next_negative_count,
-                                         next_zero_count);
-@@ -880,7 +880,7 @@ RayMatrixAlgorithm<IndexSet>::compute3(
-         )
- 
-         // We sort the vectors into zeros, positives, then negatives.
--        sort(vs, supports, next_col, next_zero_count, next_positive_count,
-+        RayImplementation<IndexSet>::sort(vs, supports, next_col, next_zero_count, next_positive_count,
-                         next_negative_count);
- 
-         DEBUG_4ti2(*out << "Rays:\n" << vs << "\n";)
-@@ -944,7 +944,7 @@ RayMatrixAlgorithm<IndexSet>::compute3(
-                     IndexSet::set_difference(supports[r2], r1_supp, temp_diff);
-                     if (temp_diff.power_of_2())
-                     {
--                        create_new_vector(vs, supports, r1, r2, next_col,
-+                        this->create_new_vector(vs, supports, r1, r2, next_col,
-                                             next_positive_count, next_negative_count,
-                                             temp, temp_supp);
-                         DEBUG_4ti2(++num_one_diff_added;)
-@@ -959,7 +959,7 @@ RayMatrixAlgorithm<IndexSet>::compute3(
-                     IndexSet::set_difference(r1_supp, supports[r2], temp_diff);
-                     if (temp_diff.power_of_2())
-                     {
--                        create_new_vector(vs, supports, r1, r2, next_col,
-+                        this->create_new_vector(vs, supports, r1, r2, next_col,
-                                             next_positive_count, next_negative_count,
-                                             temp, temp_supp);
-                         DEBUG_4ti2(++num_one_diff_added;)
-@@ -984,7 +984,7 @@ RayMatrixAlgorithm<IndexSet>::compute3(
-                             IndexSet::set_difference(r1_supp, supports[r2], temp_diff2);
-                             if (temp_diff2.power_of_2())
-                             {
--                                create_new_vector(vs, supports, r1, r2, next_col,
-+                                this->create_new_vector(vs, supports, r1, r2, next_col,
-                                     next_positive_count, next_negative_count,
-                                     temp, temp_supp);
-                                 DEBUG_4ti2(++num_one_diff_added;)
-@@ -996,7 +996,7 @@ RayMatrixAlgorithm<IndexSet>::compute3(
-                             DEBUG_4ti2(++num_checks;)
-                             if (rank_check(matrix, temp_matrix, temp_diff, r1_rows))
-                             {
--                                create_new_vector(vs, supports, r1, r2, next_col,
-+                                this->create_new_vector(vs, supports, r1, r2, next_col,
-                                                 next_positive_count, next_negative_count,
-                                                 temp, temp_supp);
-                                 DEBUG_4ti2(++num_added;)
-@@ -1012,7 +1012,7 @@ RayMatrixAlgorithm<IndexSet>::compute3(
-                         IndexSet::set_difference(supports[r2], r1_supp, temp_diff);
-                         if (temp_diff.power_of_2())
-                         {
--                            create_new_vector(vs, supports, r1, r2, next_col,
-+                            this->create_new_vector(vs, supports, r1, r2, next_col,
-                                 next_positive_count, next_negative_count,
-                                 temp, temp_supp);
-                             DEBUG_4ti2(++num_one_diff_added;)
-diff --git a/src/groebner/RaySupportAlgorithm.tpp b/src/groebner/RaySupportAlgorithm.tpp
-index 0b31647..2b17957 100644
---- a/src/groebner/RaySupportAlgorithm.tpp
-+++ b/src/groebner/RaySupportAlgorithm.tpp
-@@ -773,7 +773,7 @@ RaySupportAlgorithm<IndexSet>::compute3(
- 
-         // Find the next column.
-         int next_positive_count, next_negative_count, next_zero_count;
--        Index next_col = next_column(vs, remaining,
-+        Index next_col = this->next_column(vs, remaining,
-                                         next_positive_count,
-                                         next_negative_count,
-                                         next_zero_count);
-@@ -788,7 +788,7 @@ RaySupportAlgorithm<IndexSet>::compute3(
-         )
- 
-         // We sort the vectors into zeros, positives, then negatives.
--        sort(vs, supports, next_col, next_zero_count, next_positive_count,
-+        RayImplementation<IndexSet>::sort(vs, supports, next_col, next_zero_count, next_positive_count,
-                         next_negative_count);
- 
-         int original_size = vs.get_number();
-@@ -852,7 +852,7 @@ RaySupportAlgorithm<IndexSet>::compute3(
-                     IndexSet::set_difference(supports[r2], r1_supp, temp_diff);
-                     if (temp_diff.power_of_2())
-                     {
--                        create_new_vector(vs, supports, r1, r2, next_col,
-+                        this->create_new_vector(vs, supports, r1, r2, next_col,
-                                             next_positive_count, next_negative_count,
-                                             temp, temp_supp);
-                         DEBUG_4ti2(++num_added;)
-@@ -866,7 +866,7 @@ RaySupportAlgorithm<IndexSet>::compute3(
-                     IndexSet::set_difference(r1_supp, supports[r2], temp_diff);
-                     if (temp_diff.power_of_2())
-                     {
--                        create_new_vector(vs, supports, r1, r2, next_col,
-+                        this->create_new_vector(vs, supports, r1, r2, next_col,
-                                             next_positive_count, next_negative_count,
-                                             temp, temp_supp);
-                         DEBUG_4ti2(++num_one_diff_added;)
-@@ -885,7 +885,7 @@ RaySupportAlgorithm<IndexSet>::compute3(
-                     zero_supp.set_union(supports[index]);
-                     if (index >= r2_index && index < r2_finish)
-                     {
--                        create_new_vector(vs, supports, r1, index, next_col,
-+                        this->create_new_vector(vs, supports, r1, index, next_col,
-                             next_positive_count, next_negative_count,
-                             temp, temp_supp);
-                         DEBUG_4ti2(++num_added;)
-@@ -905,7 +905,7 @@ RaySupportAlgorithm<IndexSet>::compute3(
-                         IndexSet::set_difference(r1_supp, supports[r2], temp_diff2);
-                         if (temp_diff2.power_of_2())
-                         {
--                            create_new_vector(vs, supports, r1, r2, next_col,
-+                            this->create_new_vector(vs, supports, r1, r2, next_col,
-                                     next_positive_count, next_negative_count,
-                                     temp, temp_supp);
-                             DEBUG_4ti2(++num_one_diff_added;)
-@@ -918,7 +918,7 @@ RaySupportAlgorithm<IndexSet>::compute3(
-                         DEBUG_4ti2(++num_checks;)
-                         if (!tree.dominated(temp_supp, r1, r2))
-                         {
--                            create_new_vector(vs, supports, r1, r2, next_col,
-+                            this->create_new_vector(vs, supports, r1, r2, next_col,
-                                             next_positive_count, next_negative_count,
-                                             temp, temp_supp);
-                             DEBUG_4ti2(++num_added;)