[med-svn] [SCM] aghermann branch, master, updated. 551e213a23b59b71cba6a9c3a282d1b60e21b854

[Andrei Zavada]

The following commit has been merged in the master branch:
commit bbdc1e10751ae142d4b7df2a28b6989e80741eee
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Apr 14 00:42:07 2013 +0300

    some insightful comments and trivial maintenance duties

diff --git a/src/common/config-validate.hh b/src/common/config-validate.hh
index 1c124b0..718081b 100644
--- a/src/common/config-validate.hh
+++ b/src/common/config-validate.hh
@@ -144,11 +144,30 @@ struct SValidator {
 };
 
 
+// // specialise for FP types to have an additional isfinite check
+// // is it obviously redundant?
+// template <> inline bool SValidator<float>::SVFRangeIn::
+// operator()( const float& v)
+// { return isfinite(v) and v > lo && v < hi; }
+
+// template <> inline bool SValidator<double>::SVFRangeIn::
+// operator()( const float& v)
+// { return isfinite(v) and v > lo && v < hi; }
+
+// template <> inline bool SValidator<float>::SVFRangeEx::
+// operator()( const float& v)
+// { return isfinite(v) and v > lo && v < hi; }
+
+// template <> inline bool SValidator<double>::SVFRangeEx::
+// operator()( const float& v)
+// { return isfinite(v) and v > lo && v < hi; }
+
+
 template <>
 inline void
 SValidator<size_t>::get( const libconfig::Config& C) const
 {
-	int tmp;
+	int tmp; // libconfig doesn't deal in unsigned values
 	if ( not C.lookupValue( key, tmp) ) {
 		fprintf( stderr, "SValidator::get(): key %s not found\n", key.c_str());
 		return; // leave at default
diff --git a/src/libsigfile/page.hh b/src/libsigfile/page.hh
index d9176ec..2416788 100644
--- a/src/libsigfile/page.hh
+++ b/src/libsigfile/page.hh
@@ -17,7 +17,7 @@
 #include <vector>
 #include <array>
 #include <stdexcept>
-#include "../common/lang.hh"
+#include "common/lang.hh"
 
 #if HAVE_CONFIG_H && !defined(VERSION)
 #  include <config.h>
diff --git a/src/main.cc b/src/main.cc
index e97c6d0..cd66110 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -87,7 +87,10 @@ main( int argc, char **argv)
 		agh::global::init_rng();
 #ifdef _OPENMP
 		agh::global::num_procs = omp_get_max_threads();
-		printf( "This host is SMP-capable (omp_get_max_threads() returns %d)\n", agh::global::num_procs);
+		if ( agh::global::num_procs > 1 )
+			printf( "This host is SMP-capable (omp_get_max_threads() returns %d)\n", agh::global::num_procs);
+		else
+			printf( "This host is not SMP-capable\n");
 #endif
 		if ( aghui::prepare_for_expdesign() ) {
 			aghui::pop_ok_message( NULL, "UI failed to initialize", "Your install is broken.");

-- 
Sleep experiment manager