From 467be1a69e03d1fef8e72accee0106864924db40 Mon Sep 17 00:00:00 2001
From: Joe Thornber <ejt@redhat.com>
Date: Mon, 24 Jul 2017 15:40:17 +0100
Subject: [PATCH] Add some std namespaces to get tests building.

I guess a rogue header had previously been using the std namespace.
---
 persistent-data/data-structures/array_block.h | 10 +++++-----
 persistent-data/space-maps/core.h             |  2 +-
 unit-tests/test_utils.cc                      |  4 ++++
 unit-tests/test_utils.h                       |  8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/persistent-data/data-structures/array_block.h b/persistent-data/data-structures/array_block.h
index 496c7a7..21fae1b 100644
--- a/persistent-data/data-structures/array_block.h
+++ b/persistent-data/data-structures/array_block.h
@@ -83,11 +83,11 @@ namespace persistent_data {
 				out << "array_block::grow called with more than max_entries ("
 				    << nr << " > " << max_entries();
 
-				throw runtime_error(out.str());
+				throw std::runtime_error(out.str());
 			}
 
 			if (nr <= old_nr)
-				throw runtime_error("array_block grow method called with smaller size");
+				throw std::runtime_error("array_block grow method called with smaller size");
 
 			grow_(nr, default_value);
 		}
@@ -96,7 +96,7 @@ namespace persistent_data {
 			uint32_t old_nr = nr_entries();
 
 			if (nr >= old_nr)
-				throw runtime_error("array_block shrink called with larger size");
+				throw std::runtime_error("array_block shrink called with larger size");
 
 			shrink_(nr);
 		}
@@ -172,7 +172,7 @@ namespace persistent_data {
 
 		disk_type &element_at(unsigned int index) {
 			if (index >= nr_entries())
-				throw runtime_error("array_block index out of bounds");
+				throw std::runtime_error("array_block index out of bounds");
 
 			array_block_disk *a = get_header();
 			disk_type *elts = reinterpret_cast<disk_type *>(a + 1);
@@ -181,7 +181,7 @@ namespace persistent_data {
 
 		disk_type const &element_at(unsigned int index) const {
 			if (index >= nr_entries())
-				throw runtime_error("array_block index out of bounds");
+				throw std::runtime_error("array_block index out of bounds");
 
 			array_block_disk const *a = get_header();
 			disk_type const *elts = reinterpret_cast<disk_type const *>(a + 1);
diff --git a/persistent-data/space-maps/core.h b/persistent-data/space-maps/core.h
index 4547f12..85ee990 100644
--- a/persistent-data/space-maps/core.h
+++ b/persistent-data/space-maps/core.h
@@ -85,7 +85,7 @@ namespace persistent_data {
 				if (search_start_ >= ms->second)
 					continue;
 
-				for (block_address b = max(search_start_, ms->first); b < ms->second; b++) {
+				for (block_address b = std::max(search_start_, ms->first); b < ms->second; b++) {
 					if (b >= counts_.size())
 						throw std::runtime_error("block out of bounds");
 
diff --git a/unit-tests/test_utils.cc b/unit-tests/test_utils.cc
index 85876bd..7f65607 100644
--- a/unit-tests/test_utils.cc
+++ b/unit-tests/test_utils.cc
@@ -2,6 +2,10 @@
 
 #include "persistent-data/space-maps/core.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 using namespace persistent_data;
 using namespace std;
 using namespace test;
diff --git a/unit-tests/test_utils.h b/unit-tests/test_utils.h
index e979d07..56862e2 100644
--- a/unit-tests/test_utils.h
+++ b/unit-tests/test_utils.h
@@ -31,10 +31,10 @@ namespace test {
 	template <uint32_t BlockSize>
 	typename block_manager<BlockSize>::ptr
 	create_bm(block_address nr = 1024) {
-		string const path("./test.data");
+		std::string const path("./test.data");
 		int r = system("rm -f ./test.data");
 		if (r < 0)
-			throw runtime_error("couldn't rm -f ./test.data");
+			throw std::runtime_error("couldn't rm -f ./test.data");
 
 		return typename block_manager<BlockSize>::ptr(
 			new block_manager<BlockSize>(path, nr, MAX_HELD_LOCKS,
@@ -121,9 +121,9 @@ namespace test {
 		std::string const &get_path() const;
 
 	private:
-		static string gen_path(string const &base);
+		static std::string gen_path(std::string const &base);
 
-		string path_;
+		std::string path_;
 	};
 
 	//--------------------------------