From cc756cb22d9c6c4c5e7dd8813fcec883e5f08032 Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Fri, 12 Feb 2016 22:07:44 +0900
Subject: [PATCH] fix test

---
 sprout/bitset/bitset.hpp | 4 ++--
 testspr/assert.hpp       | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sprout/bitset/bitset.hpp b/sprout/bitset/bitset.hpp
index 499b73bf..275ede64 100644
--- a/sprout/bitset/bitset.hpp
+++ b/sprout/bitset/bitset.hpp
@@ -943,14 +943,14 @@ namespace sprout {
 		typedef bool value_type;
 	public:
 		class reference {
-			friend class bitset;
+			friend class bitset<N>;
 		private:
 			word_type* wp_;
 			size_type bpos_;
 		private:
 			reference() SPROUT_DELETED_FUNCTION_DECL
 		public:
-			SPROUT_CONSTEXPR reference(bitset& b, size_type pos) SPROUT_NOEXCEPT
+			SPROUT_CONSTEXPR reference(bitset<N>& b, size_type pos) SPROUT_NOEXCEPT
 				: wp_(&b.getword(pos))
 				, bpos_(base_type::whichbit(pos))
 			{}
diff --git a/testspr/assert.hpp b/testspr/assert.hpp
index 57f6d38e..3ad9a42c 100644
--- a/testspr/assert.hpp
+++ b/testspr/assert.hpp
@@ -10,6 +10,7 @@
 
 #include <string>
 #include <stdexcept>
+#include <sprout/config.hpp>
 #include <sprout/assert.hpp>
 #ifdef TESTSPR_CONFIG_ENABLE_STATIC_WARNING
 #	include <sprout/static_warning.hpp>
@@ -58,11 +59,11 @@ namespace testspr {
 //
 // TESTSPR_BOTH_ASSERT
 //
-#ifndef SPROUT_CONFIG_DISABLE_CONSTEXPR
+#if !defined(SPROUT_CONFIG_DISABLE_CONSTEXPR) && !defined(SPROUT_NO_STATIC_CONSTEXPR_INITIALIZATION)
 #	define TESTSPR_BOTH_ASSERT(expr) TESTSPR_STATIC_ASSERT(expr); TESTSPR_ASSERT(expr)
-#else	// #ifndef SPROUT_CONFIG_DISABLE_CONSTEXPR
+#else
 #	define TESTSPR_BOTH_ASSERT(expr) TESTSPR_ASSERT(expr)
-#endif	// #ifndef SPROUT_CONFIG_DISABLE_CONSTEXPR
+#endif
 
 //
 // TESTSPR_STATIC_WARNING