From 7c2b3171c23aabd7f09d4a243727d0ce7ebe626a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Fri, 30 Mar 2012 01:21:08 +0000
Subject: [PATCH] Further GCC 4.7.0 fixes.

git-svn-id: svn://localhost/ardour2/branches/3.0@11768 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/audiographer/audiographer/type_utils.h | 1 +
 libs/evoral/test/SequenceTest.hpp           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/audiographer/audiographer/type_utils.h b/libs/audiographer/audiographer/type_utils.h
index 360168d55d..1d4754dee9 100644
--- a/libs/audiographer/audiographer/type_utils.h
+++ b/libs/audiographer/audiographer/type_utils.h
@@ -6,6 +6,7 @@
 #include <boost/type_traits.hpp>
 #include <memory>
 #include <algorithm>
+#include <cstring>
 
 namespace AudioGrapher
 {
diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.hpp
index 403ac0fd13..79af6779fb 100644
--- a/libs/evoral/test/SequenceTest.hpp
+++ b/libs/evoral/test/SequenceTest.hpp
@@ -99,7 +99,7 @@ public:
 	virtual uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf) {
 		if (type == cc_type) {
 			CPPUNIT_ASSERT(size == 3);
-			events.push_back(make_pair(time, buf[2]));
+			events.push_back(std::make_pair(time, buf[2]));
 		}
 		return size;
 	}