diff options
| -rw-r--r-- | config/open-axiom.m4 | 2 | ||||
| -rwxr-xr-x | configure | 32 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/utils/string-pool.H | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 1a7b1a78..746c954e 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -357,7 +357,7 @@ dnl -- OPENAXIOM_CXX_EXTRA_OPTIONS -- dnl --------------------------------- AC_DEFUN([OPENAXIOM_EXTRA_CXX_OPTIONS], [ oa_extra_cxxflags= -OPENAXIOM_CXX_GROK_OPTION([-Wno-mismatch-tags],[oa_extra_cxxflags]) +OPENAXIOM_CXX_GROK_OPTION([-Wno-mismatched-tags],[oa_extra_cxxflags]) OPENAXIOM_CXX_GROK_OPTION([-Wno-string-plus-int],[oa_extra_cxxflags]) AC_SUBST(oa_extra_cxxflags) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2015-04-02. +# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2015-10-02. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.5.0-2015-04-02' -PACKAGE_STRING='OpenAxiom 1.5.0-2015-04-02' +PACKAGE_VERSION='1.5.0-2015-10-02' +PACKAGE_STRING='OpenAxiom 1.5.0-2015-10-02' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -1421,7 +1421,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.5.0-2015-04-02 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.5.0-2015-10-02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1496,7 +1496,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2015-04-02:";; + short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2015-10-02:";; esac cat <<\_ACEOF @@ -1613,7 +1613,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.5.0-2015-04-02 +OpenAxiom configure 1.5.0-2015-10-02 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2430,7 +2430,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.5.0-2015-04-02, which was +It was created by OpenAxiom $as_me 1.5.0-2015-10-02, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3449,7 +3449,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.5.0-2015-04-02' + VERSION='1.5.0-2015-10-02' cat >>confdefs.h <<_ACEOF @@ -5557,7 +5557,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext oa_extra_cxxflags= -opt=-Wno-mismatch-tags # mandatory +opt=-Wno-mismatched-tags # mandatory accumulator=oa_extra_cxxflags # optional if test -z $accumulator; then accumulator=CXXFLAGS @@ -17920,7 +17920,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17966,7 +17966,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17990,7 +17990,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18035,7 +18035,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18059,7 +18059,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -20059,7 +20059,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.5.0-2015-04-02, which was +This file was extended by OpenAxiom $as_me 1.5.0-2015-10-02, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20129,7 +20129,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenAxiom config.status 1.5.0-2015-04-02 +OpenAxiom config.status 1.5.0-2015-10-02 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e13fd9d5..60b58d2c 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ dnl Makefiles for building OpenAxiom interpreter, compiler, libraries, and dnl auxiliary tools where appropriate. dnl -AC_INIT([OpenAxiom], [1.5.0-2015-04-02], +AC_INIT([OpenAxiom], [1.5.0-2015-10-02], [open-axiom-bugs@lists.sf.net]) dnl Most of the macros used in this configure.ac are defined in files diff --git a/src/utils/string-pool.H b/src/utils/string-pool.H index 220f43be..1f746e6d 100644 --- a/src/utils/string-pool.H +++ b/src/utils/string-pool.H @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2014, Gabriel Dos Reis. +// Copyright (C) 2010-2015, Gabriel Dos Reis. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -54,7 +54,7 @@ namespace OpenAxiom { protected: const Byte* text; // pointer to the byte sequence size_t length; // number of bytes in this string - friend class StringPool; + friend StringPool; StringItem() : text(), length() { } }; |