[med-svn] [SCM] aghermann branch, master, updated. 6da4097099d8c9a4899b0dd94727010588b26301

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 79b22151dc6bf3c1ca5ec3297bfffd5d586b29f1
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sat Dec 15 16:35:46 2012 +0200

    forgot to save some size_t CExpDesign settings

diff --git a/configure.ac b/configure.ac
index f1ca8cb..1556f60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-12 Andrei Zavada <johnhommer at gmail.com>])
 
-AC_INIT([Aghermann], [0.7.5.1], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [0.7.6_rc], [johnhommer at gmail.com])
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
diff --git a/src/common/config-validate.hh b/src/common/config-validate.hh
index 741eff4..a2cc43c 100644
--- a/src/common/config-validate.hh
+++ b/src/common/config-validate.hh
@@ -13,6 +13,8 @@
 #ifndef _AGH_COMMON_CONFIG_VALIDATE_H
 #define _AGH_COMMON_CONFIG_VALIDATE_H
 
+#include <limits.h>
+
 #include <forward_list>
 #include <array>
 #include <functional>
@@ -64,6 +66,14 @@ put( libconfig::Config& C, const string& key, const T& value)
 {
 	ensure_path( C.getRoot(), libconfig_type_id<T>(), key) = value;
 }
+template <> // specialise for size_t
+inline void
+put( libconfig::Config& C, const string& key, const size_t& value)
+{
+	if ( value > INT_MAX )
+		fprintf( stderr, "Value being saved way too long for any practical purpose (unintialized?): %zu\n", value);
+	ensure_path( C.getRoot(), libconfig_type_id<int>(), key) = (int)value;
+}
 
 template <typename T>
 void
diff --git a/src/expdesign/loadsave.cc b/src/expdesign/loadsave.cc
index db2f7b0..4fe7dd5 100644
--- a/src/expdesign/loadsave.cc
+++ b/src/expdesign/loadsave.cc
@@ -105,6 +105,7 @@ agh::CExpDesign::save_settings()
 	confval::put( config_keys_d, conf);
 	confval::put( config_keys_g, conf);
 	confval::put( config_keys_b, conf);
+	confval::put( config_keys_z, conf);
 
       // only save _agh_basic_tunables_
 	for ( size_t t = 0; t < ach::TTunable::_basic_tunables; ++t )

-- 
Sleep experiment manager