merge from 2.0-ongoing @ 3581

git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf

10 files changed, 22 insertions, 19 deletions

diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index 87173f0874..4b65e3ee38 100644
--- a/libs/pbd/SConscript
+++ b/libs/pbd/SConscript
@@ -6,7 +6,7 @@ import glob
 
 Import('env libraries i18n install_prefix')
 
-pbd = env.Copy()
+pbd = env.Clone()
 
 domain = 'libpbd'
 
diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index 94d039ba86..0dbe6baf52 100644
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -21,7 +21,8 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstring>
 
 #include <pbd/base_ui.h>
 #include <pbd/error.h>
@@ -85,20 +86,20 @@ BaseUI::setup_signal_pipe ()
 	*/
 
 	if (pipe (signal_pipe)) {
-		error << string_compose (_("%1-UI: cannot create error signal pipe (%2)"), _name, std::strerror (errno))
+		error << string_compose (_("%1-UI: cannot create error signal pipe (%2)"), _name, ::strerror (errno))
 		      << endmsg;
 
 		return -1;
 	}
 
 	if (fcntl (signal_pipe[0], F_SETFL, O_NONBLOCK)) {
-		error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal read pipe (%2)"), _name, std::strerror (errno))
+		error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal read pipe (%2)"), _name, ::strerror (errno))
 		      << endmsg;
 		return -1;
 	}
 
 	if (fcntl (signal_pipe[1], F_SETFL, O_NONBLOCK)) {
-		error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal write pipe (%2)"), _name, std::strerror (errno))
+		error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal write pipe (%2)"), _name, ::strerror (errno))
 		      << endmsg;
 		return -1;
 	}
diff --git a/libs/pbd/enumwriter.cc b/libs/pbd/enumwriter.cc
index 7674410ec9..7033e5f3b1 100644
--- a/libs/pbd/enumwriter.cc
+++ b/libs/pbd/enumwriter.cc
@@ -18,10 +18,10 @@
     $Id$
 */
 
-#include <ctype.h>
+#include <cctype>
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 
 #include <pbd/enumwriter.h>
 #include <pbd/error.h>
diff --git a/libs/pbd/fpu.cc b/libs/pbd/fpu.cc
index f6850a57dc..76150824c7 100644
--- a/libs/pbd/fpu.cc
+++ b/libs/pbd/fpu.cc
@@ -1,5 +1,5 @@
 #define _XOPEN_SOURCE 600
-#include <stdlib.h>
+#include <cstdlib>
 #include <stdint.h>
 
 #include <pbd/fpu.h>
diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc
index acc549890a..f273146343 100644
--- a/libs/pbd/mountpoint.cc
+++ b/libs/pbd/mountpoint.cc
@@ -21,6 +21,7 @@
 #include <cstdio>
 #include <cstring>
 #include <string>
+#include <cstring>
 #include <limits.h>
 
 #include <pbd/mountpoint.h>
diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc
index eb913cc910..e12df5efac 100644
--- a/libs/pbd/pathscanner.cc
+++ b/libs/pbd/pathscanner.cc
@@ -21,6 +21,7 @@
 #include <cstring>
 #include <cstdlib>
 #include <cstdio>
+#include <cstring>
 #include <vector>
 #include <dirent.h>
 
diff --git a/libs/pbd/pbd/functor_command.h b/libs/pbd/pbd/functor_command.h
index e335f4418e..e6c07cfdbe 100644
--- a/libs/pbd/pbd/functor_command.h
+++ b/libs/pbd/pbd/functor_command.h
@@ -44,15 +44,11 @@ class FunctorCommand : public Command
 	typedef typename FunctorMap::iterator FunctorMapIterator;
 
 	public:
-	FunctorCommand(
-		std::string functor,
-		obj_type object,
-		arg_type b,
-		arg_type a
-	) : functor_name(functor), 
-		object(object),
-		before(b),
-		after(a) 
+	FunctorCommand(std::string functor, obj_type& object, arg_type b, arg_type a) 
+		: functor_name(functor)
+		, object(object)
+		, before(b)
+		, after(a) 
 	{
 		method = find_functor(functor);
 
@@ -76,6 +72,7 @@ class FunctorCommand : public Command
 		std::stringstream ss;
 		
 		XMLNode *node = new XMLNode("FunctorCommand");
+		node->add_property("type_name", typeid(obj_type).name());
 		node->add_property("functor", functor_name);
 		ss << before;
 		node->add_property("before", ss.str());
diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc
index 434429e69d..46de65153e 100644
--- a/libs/pbd/pool.cc
+++ b/libs/pbd/pool.cc
@@ -21,6 +21,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <vector>
+#include <cstdlib>
 
 #include <pbd/pool.h>
 #include <pbd/error.h>
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index dc9a5e18ab..39dd46be3d 100644
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -30,7 +30,7 @@ PBD::trace_twb ()
 #ifdef HAVE_EXECINFO
 
 #include <execinfo.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 void
 PBD::stacktrace (std::ostream& out, int levels)
diff --git a/libs/pbd/undo.cc b/libs/pbd/undo.cc
index aeff37cce7..f04b4d9431 100644
--- a/libs/pbd/undo.cc
+++ b/libs/pbd/undo.cc
@@ -21,6 +21,7 @@
 #include <iostream>
 #include <string>
 #include <sstream>
+#include <time.h>
 
 #include <pbd/undo.h>
 #include <pbd/xml++.h>
@@ -34,6 +35,7 @@ using namespace sigc;
 UndoTransaction::UndoTransaction ()
 	: _clearing(false)
 {
+	gettimeofday (&_timestamp, 0);
 }
 
 UndoTransaction::UndoTransaction (const UndoTransaction& rhs)