Merge branch 'master' of ssh://bitbucket.org/czan/honours

Conflicts:
	impl/IdSet.hpp
	impl/main.cpp
	impl/systems/long-fixpoint

1 files changed, 20 insertions, 20 deletions

diff --git a/impl/antlr/libantlr3c-3.4/Makefile b/impl/antlr/libantlr3c-3.4/Makefile
index 30002a2..1f6a077 100644
--- a/impl/antlr/libantlr3c-3.4/Makefile
+++ b/impl/antlr/libantlr3c-3.4/Makefile
@@ -33,8 +33,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -121,12 +121,12 @@ DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4/missing --run tar
+ACLOCAL = ${SHELL} /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4/missing --run aclocal-1.11
+AMTAR = ${SHELL} /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4/missing --run automake-1.11
+AUTOCONF = ${SHELL} /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4/missing --run automake-1.11
 AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -150,7 +150,7 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld
+LD = /usr/bin/ld -m elf_x86_64
 LDFLAGS = 
 LIBOBJS = 
 LIBS = 
@@ -159,7 +159,7 @@ LIPO =
 LN_S = ln -s
 LTLIBOBJS = 
 MAINT = #
-MAKEINFO = ${SHELL} /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
@@ -182,10 +182,10 @@ SET_MAKE =
 SHELL = /bin/bash
 STRIP = strip
 VERSION = 3.4
-abs_builddir = /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4
-abs_srcdir = /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4
-abs_top_builddir = /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4
-abs_top_srcdir = /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4
+abs_builddir = /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4
+abs_srcdir = /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4
+abs_top_builddir = /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4
+abs_top_srcdir = /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4
 ac_ct_CC = gcc
 ac_ct_DUMPBIN = 
 am__include = include
@@ -194,26 +194,26 @@ am__quote =
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
+build = x86_64-unknown-linux-gnu
 build_alias = 
-build_cpu = i686
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
+host = x86_64-unknown-linux-gnu
 host_alias = 
-host_cpu = i686
+host_cpu = x86_64
 host_os = linux-gnu
-host_vendor = pc
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/carlo/honours/repo/impl/antlr/libantlr3c-3.4/install-sh
+install_sh = ${SHELL} /home/carlo/laptop-repository/impl/antlr/libantlr3c-3.4/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale