[med-svn] [SCM] aghermann branch, master, updated. 3b8a63cca9e297a548ea6094bd42a016ecec03b8

[Andrei Zavada]

The following commit has been merged in the master branch:
commit bd8e84640e2ba981b3911110f627e7c8a2ba4b02
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Dec 16 02:33:02 2012 +0200

    style touchups

diff --git a/src/ica/ica.hh b/src/ica/ica.hh
index dc8687f..52ef4fc 100644
--- a/src/ica/ica.hh
+++ b/src/ica/ica.hh
@@ -21,7 +21,7 @@
 #include <functional>
 
 #include <itpp/base/vec.h>
-#include "itpp/signal/fastica.h"
+#include <itpp/signal/fastica.h>
 
 
 #if HAVE_CONFIG_H && !defined(VERSION)
diff --git a/src/ui/sf/sf-ica.cc b/src/ui/sf/sf-ica.cc
index beff772..68530e9 100644
--- a/src/ui/sf/sf-ica.cc
+++ b/src/ui/sf/sf-ica.cc
@@ -155,7 +155,7 @@ int
 aghui::SScoringFacility::
 remix_ics()
 {
-	if ( ica == NULL )
+	if ( ica == nullptr )
 		return 1;
 
 	aghui::SBusyBlock bb (wScoringFacility);

-- 
Sleep experiment manager