Module: ppl/ppl Branch: master Commit: 27bdc4a34adfb90434a3a5a1cb31221d9fd9a7e1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=27bdc4a34adfb... Author: Roberto Bagnara <roberto.bagnara@bugseng.com> Date: Fri Mar 28 22:32:00 2014 +0100 Solve some compilation issues with clang++ -std=c++11. (Thanks to Stefan Schupp.) --- src/checked_mpz_inlines.hh | 5 +++++ src/version.cc | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/checked_mpz_inlines.hh b/src/checked_mpz_inlines.hh index dad5085..9deaf74 100644 --- a/src/checked_mpz_inlines.hh +++ b/src/checked_mpz_inlines.hh @@ -51,8 +51,13 @@ round_gt_mpz(mpz_class& to, Rounding_Dir dir) { } #ifdef PPL_HAVE_TYPEOF +#ifdef PPL_HAVE_CXX11 +//! Type of the _mp_size field of GMP's __mpz_struct. +typedef decltype(__mpz_struct()._mp_size) mp_size_field_t; +#else //! Type of the _mp_size field of GMP's __mpz_struct. typedef typeof(__mpz_struct()._mp_size) mp_size_field_t; +#endif #else //! This is assumed to be the type of the _mp_size field of GMP's __mpz_struct. typedef int mp_size_field_t; diff --git a/src/version.cc b/src/version.cc index 3e70ca7..99e7721 100644 --- a/src/version.cc +++ b/src/version.cc @@ -31,7 +31,7 @@ namespace { const char version_string[] = PPL_PACKAGE_VERSION; const char banner_string[] = -"This is "PPL_PACKAGE_NAME" (PPL) version "PPL_PACKAGE_VERSION".\n" +"This is " PPL_PACKAGE_NAME " (PPL) version " PPL_PACKAGE_VERSION ".\n" "Copyright (C) 2001-2010 Roberto Bagnara <bagnara@cs.unipr.it>\n" "Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com)\n" "\n" @@ -48,12 +48,12 @@ const char banner_string[] = #define xstr(s) str(s) "Compiled by the Intel C++ compiler version "xstr(__INTEL_COMPILER)".\n" #elif defined(__GNUC__) -"Compiled by the GNU C++ compiler version "__VERSION__".\n" +"Compiled by the GNU C++ compiler version " __VERSION__ ".\n" #else "Compiled by an unknown compiler.\n" #endif "\n" -"Report bugs to "PPL_PACKAGE_BUGREPORT"." +"Report bugs to " PPL_PACKAGE_BUGREPORT "." " For the most up-to-date information\n" "see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ .\n" "\n"