From 7a2c41022f2ac72d0e0980495005371471ac4986 Mon Sep 17 00:00:00 2001
From: Joe Thornber <ejt@redhat.com>
Date: Mon, 9 Dec 2013 12:46:46 +0000
Subject: [PATCH] Remove some 'typename's since older versions of g++ don't
 like.

---
 caching/hint_array.cc                     | 2 +-
 caching/hint_array.h                      | 2 +-
 caching/restore_emitter.cc                | 2 +-
 persistent-data/data-structures/bitset.cc | 2 +-
 persistent-data/data-structures/bitset.h  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/caching/hint_array.cc b/caching/hint_array.cc
index 8e9f275..58fcded 100644
--- a/caching/hint_array.cc
+++ b/caching/hint_array.cc
@@ -239,7 +239,7 @@ hint_array::hint_array(tm_ptr tm, unsigned width)
 {
 }
 
-hint_array::hint_array(typename hint_array::tm_ptr tm, unsigned width,
+hint_array::hint_array(hint_array::tm_ptr tm, unsigned width,
 		       block_address root, unsigned nr_entries)
 	: width_(check_width(width)),
 	  impl_(mk_array(tm, width, root, nr_entries))
diff --git a/caching/hint_array.h b/caching/hint_array.h
index dfd3bcd..6e8121b 100644
--- a/caching/hint_array.h
+++ b/caching/hint_array.h
@@ -56,7 +56,7 @@ namespace caching {
 	class hint_array {
 	public:
 		typedef boost::shared_ptr<hint_array> ptr;
-		typedef typename persistent_data::transaction_manager::ptr tm_ptr;
+		typedef persistent_data::transaction_manager::ptr tm_ptr;
 
 		hint_array(tm_ptr tm, unsigned width);
 		hint_array(tm_ptr tm, unsigned width, block_address root, unsigned nr_entries);
diff --git a/caching/restore_emitter.cc b/caching/restore_emitter.cc
index 55be343..fba7e60 100644
--- a/caching/restore_emitter.cc
+++ b/caching/restore_emitter.cc
@@ -59,7 +59,7 @@ namespace {
 		virtual void mapping(pd::block_address cblock,
 				     pd::block_address oblock,
 				     bool dirty) {
-			typename caching::mapping m;
+			caching::mapping m;
 			m.oblock_ = oblock;
 			m.flags_ = M_VALID;
 
diff --git a/persistent-data/data-structures/bitset.cc b/persistent-data/data-structures/bitset.cc
index fa334ef..1570fc1 100644
--- a/persistent-data/data-structures/bitset.cc
+++ b/persistent-data/data-structures/bitset.cc
@@ -30,7 +30,7 @@ namespace persistent_data {
 		class bitset_impl {
 		public:
 			typedef boost::shared_ptr<bitset_impl> ptr;
-			typedef typename persistent_data::transaction_manager::ptr tm_ptr;
+			typedef persistent_data::transaction_manager::ptr tm_ptr;
 
 			bitset_impl(tm_ptr tm)
 			: nr_bits_(0),
diff --git a/persistent-data/data-structures/bitset.h b/persistent-data/data-structures/bitset.h
index b01845e..a6e90ae 100644
--- a/persistent-data/data-structures/bitset.h
+++ b/persistent-data/data-structures/bitset.h
@@ -49,7 +49,7 @@ namespace persistent_data {
 	class bitset {
 	public:
 		typedef boost::shared_ptr<bitset> ptr;
-		typedef typename persistent_data::transaction_manager::ptr tm_ptr;
+		typedef persistent_data::transaction_manager::ptr tm_ptr;
 
 		bitset(tm_ptr tm);
 		bitset(tm_ptr tm, block_address root, unsigned nr_bits);