Merge branch 'master' of https://github.com/jlblancoc/mrpt

JGMonroy · JGMonroy · commit d0d384e1e9e8 · 2014-04-30T13:13:16.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 *~
-samples/CMakeLists.txt
+samples/CMakeLists.txt
+build*
+install*
diff --git a/libs/hwdrivers/src/CNationalInstrumentsDAQ.cpp b/libs/hwdrivers/src/CNationalInstrumentsDAQ.cpp
@@ -317,7 +317,7 @@ const daqmx_str_val daqmx_vals[] = {
 
 int daqmx_defstr2num(const std::string &str)
 {
-	const std::string s = mrpt::utils::trim(str);
+	const std::string s = mrpt::system::trim(str);
 
 	for (unsigned int i=0;i<sizeof(daqmx_vals)/sizeof(daqmx_vals[0]);i++)
 	{

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ const daqmx_str_val daqmx_vals[] = {`
`317`	`317`
`318`	`318`	`int daqmx_defstr2num(const std::string &str)`
`319`	`319`	`{`
`320`		`- const std::string s = mrpt::utils::trim(str);`
	`320`	`+ const std::string s = mrpt::system::trim(str);`
`321`	`321`
`322`	`322`	`for (unsigned int i=0;i<sizeof(daqmx_vals)/sizeof(daqmx_vals[0]);i++)`
`323`	`323`	`{`