[med-svn] [SCM] aghermann branch, master, updated. 4b06a66467a52311d413e817136ece62c0e9c24a

[andrei zavada]

The following commit has been merged in the master branch:
commit efed197b24dd4aed063a6f8294f274c6a5b37ebc
Author: andrei zavada <jh at johnhommer.com>
Date:   Mon Jul 15 07:30:25 2013 +0000

    lazy janitor on vacations

diff --git a/src/libsigfile/tsv.cc b/src/libsigfile/tsv.cc
index c37ba07..ea43951 100644
--- a/src/libsigfile/tsv.cc
+++ b/src/libsigfile/tsv.cc
@@ -134,7 +134,6 @@ CTSVFile (CTSVFile&& rv)
 	_start_time = rv._start_time;
 	_end_time   = rv._end_time;
 
-
 	swap( channels, rv.channels);
 	swap( common_annotations, rv.common_annotations);
 
@@ -177,8 +176,8 @@ _parse_header()
 		if ( _line0[0] == '\n' )
 			continue;
 		if ( regexec( &RE, _line0, 1+1+2, M, 0) == 0 ) {
-			string	K = agh::str::trim( string (_line0, M[1].rm_so, (M[1].rm_eo - M[1].rm_so))),
-				V = agh::str::trim( string (_line0, M[3].rm_so, (M[3].rm_eo - M[3].rm_so)));
+			string	K = trim( string (_line0, M[1].rm_so, (M[1].rm_eo - M[1].rm_so))),
+				V = trim( string (_line0, M[3].rm_so, (M[3].rm_eo - M[3].rm_so)));
 			metadata[K] = V;
 		} else if ( _line0[0] != '#' )
 			break; // end of header

-- 
Sleep experiment manager