diff --git a/pub/CHANGELOG b/pub/CHANGELOG
index 071ad6c9cde9ac991f05e3457c034b13b47de36a..c91595c90cf80e31be7352d052a1781fb511e450 100644
--- a/pub/CHANGELOG
+++ b/pub/CHANGELOG
@@ -1,6 +1,8 @@
Release ?
-- adapt to name and API changes in libreadplus, libyamlfreeze, liblmfit
+- configure.ac automatically sets language standard to C11
+- adapt to name and API changes in
+ libreadplus, libyamlfreeze, liblmfit, libtrivia
Release 2.1.8a of 1jun13, comes with fridalibs-130601:
diff --git a/pub/m4/ax_cxx_compile_stdcxx_11.m4 b/pub/m4/ax_cxx_compile_stdcxx_11.m4
new file mode 100644
index 0000000000000000000000000000000000000000..af37acdb5ca2c9f76bffdc1a12edfb862282af56
--- /dev/null
+++ b/pub/m4/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1,133 @@
+# ============================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+#
+# DESCRIPTION
+#
+# Check for baseline language coverage in the compiler for the C++11
+# standard; if necessary, add switches to CXXFLAGS to enable support.
+#
+# The first argument, if specified, indicates whether you insist on an
+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+# -std=c++11). If neither is specified, you get whatever works, with
+# preference for an extended mode.
+#
+# The second argument, if specified 'mandatory' or if left unspecified,
+# indicates that baseline C++11 support is required and that the macro
+# should error out if no mode with that support is found. If specified
+# 'optional', then configuration proceeds regardless, after defining
+# HAVE_CXX11 if and only if a supporting mode is found.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 3
+
+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
+ template <typename T>
+ struct check
+ {
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
+ };
+
+ typedef check<check<bool>> right_angle_brackets;
+
+ int a;
+ decltype(a) b;
+
+ typedef check<int> check_type;
+ check_type c;
+ check_type&& cr = static_cast<check_type&&>(c);
+
+ auto d = a;
+])
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
+ m4_if([$1], [], [],
+ [$1], [ext], [],
+ [$1], [noext], [],
+ [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
+ m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
+ [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
+ [$2], [optional], [ax_cxx_compile_cxx11_required=false],
+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
+ AC_LANG_PUSH([C++])dnl
+ ac_success=no
+ AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
+ ax_cv_cxx_compile_cxx11,
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [ax_cv_cxx_compile_cxx11=yes],
+ [ax_cv_cxx_compile_cxx11=no])])
+ if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+ ac_success=yes
+ fi
+
+ m4_if([$1], [noext], [], [dnl
+ if test x$ac_success = xno; then
+ for switch in -std=gnu++11 -std=gnu++0x; do
+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+ $cachevar,
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [eval $cachevar=yes],
+ [eval $cachevar=no])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
+ if eval test x\$$cachevar = xyes; then
+ CXXFLAGS="$CXXFLAGS $switch"
+ ac_success=yes
+ break
+ fi
+ done
+ fi])
+
+ m4_if([$1], [ext], [], [dnl
+ if test x$ac_success = xno; then
+ for switch in -std=c++11 -std=c++0x; do
+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+ $cachevar,
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [eval $cachevar=yes],
+ [eval $cachevar=no])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
+ if eval test x\$$cachevar = xyes; then
+ CXXFLAGS="$CXXFLAGS $switch"
+ ac_success=yes
+ break
+ fi
+ done
+ fi])
+ AC_LANG_POP([C++])
+ if test x$ax_cxx_compile_cxx11_required = xtrue; then
+ if test x$ac_success = xno; then
+ AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+ fi
+ else
+ if test x$ac_success = xno; then
+ HAVE_CXX11=0
+ AC_MSG_NOTICE([No compiler with C++11 support was found])
+ else
+ HAVE_CXX11=1
+ AC_DEFINE(HAVE_CXX11,1,
+ [define if the compiler supports basic C++11 syntax])
+ fi
+
+ AC_SUBST(HAVE_CXX11)
+ fi
+])
diff --git a/pub/src/calc.cpp b/pub/src/calc.cpp
index 252b70f5509720f92e97ac46adfbd66e8f9fd383..08bc3c782928293a7a6d06638750fca9a959762a 100644
--- a/pub/src/calc.cpp
+++ b/pub/src/calc.cpp
@@ -7,6 +7,7 @@
//! \file calc.cpp
//! \brief NCalc::Calculator: the command-line pocket calculator
+#include <stdio.h>
#include <string>
#include <vector>
diff --git a/pub/src/commands.cpp b/pub/src/commands.cpp
index 199231e054b1131f02eb65072da53fd64423b9f4..f5d7c31549fc03ca8e44acba1eac6b6d0d112eec 100644
--- a/pub/src/commands.cpp
+++ b/pub/src/commands.cpp
@@ -8,6 +8,7 @@
//! \brief fridaCommand: main level commands
+#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <iostream>
diff --git a/pub/src/frida2.cpp b/pub/src/frida2.cpp
index b66ffe5d81787da8acbfc73359ea06b5775f0f63..7cbc6b81a8f928bd81386879ba2c9917b2e18354 100644
--- a/pub/src/frida2.cpp
+++ b/pub/src/frida2.cpp
@@ -35,7 +35,6 @@
#include <gsl/gsl_errno.h>
#include <trivia/string_ops.hpp>
-#include <trivia/rng.hpp>
#include <readplus/ask.hpp>
#include <readplus/readln.hpp>
@@ -75,7 +74,6 @@ int main()
// Math:
gsl_set_error_handler( my_gsl_error_handler );
- NRNG::init();
NFunctions::initialize();
// Plot windows:
diff --git a/pub/src/func.cpp b/pub/src/func.cpp
index c1ea0cd386d4c9d2dee9c10ddd4f63909af0af94..7256d30bd6984a5a9223ea1d573abd85936e462c 100644
--- a/pub/src/func.cpp
+++ b/pub/src/func.cpp
@@ -25,6 +25,8 @@
const double PI = M_PI; //4*atan(1.);
const double TWOPI = 2*M_PI; //8*atan(1.);
+static triv::RandomNumberGenerator *rng = NULL;
+
//**************************************************************************//
//* Functions of one argument *//
//**************************************************************************//
@@ -179,7 +181,9 @@ double func_cauchy (double x, double s) {
double func_ran (double v, double a) {
// a random number between v and a :
- return func_min(v,a) + (func_max(v,a)-func_min(v,a))*NRNG::uniform(); }
+ if (!rng)
+ rng = new triv::RandomNumberGenerator();
+ return rng->uniform( func_min(v,a), func_max(v,a) ); }
// Havriliak-Negami: unchecked formulae from disreputable source: