diff --git a/src/textstream/textstream.h b/src/textstream/textstream.h
index 6f0053d..fdbbb36 100644
--- a/src/textstream/textstream.h
+++ b/src/textstream/textstream.h
@@ -247,7 +247,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::iterator::iterator(const
 
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator=(const iterator & i)
 {
 	membuffer_iterator = i;
@@ -261,7 +261,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::iterator::iterator(const
 
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator=(const typename buffer_type::iterator & i)
 {
 	membuffer_iterator = i;
@@ -283,7 +283,7 @@ bool TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator!
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator++()
 {
 	++membuffer_iterator;
@@ -291,7 +291,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator++()
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::iterator
+typename TextStreamBase<char_type, stack_size, heap_block_size>::iterator
 TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator++(int)
 {
 	const_iterator old(*this);
@@ -300,7 +300,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator++(int
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator--()
 {
 	--membuffer_iterator;
@@ -308,7 +308,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator--()
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::iterator
+typename TextStreamBase<char_type, stack_size, heap_block_size>::iterator
 TextStreamBase<char_type, stack_size, heap_block_size>::iterator::operator--(int)
 {
 	const_iterator old(*this);
@@ -370,7 +370,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::const_it
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator=(const const_iterator & i)
 {
 	membuffer_const_iterator = i.membuffer_const_iterator;
@@ -378,7 +378,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator=(const iterator & i)
 {
 	membuffer_const_iterator = i.membuffer_iterator;
@@ -398,7 +398,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::const_it
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator=(const typename buffer_type::const_iterator & i)
 {
 	 membuffer_const_iterator = i;
@@ -406,7 +406,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator=(const typename buffer_type::iterator & i)
 {
 	 membuffer_const_iterator = i;
@@ -428,7 +428,7 @@ bool TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::ope
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator++()
 {
 	++membuffer_const_iterator;
@@ -436,7 +436,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator
+typename TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator
 TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator++(int)
 {
 	const_iterator old(*this);
@@ -445,7 +445,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
+typename TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator &
 TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator--()
 {
 	--membuffer_const_iterator;
@@ -453,7 +453,7 @@ TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator
 }
 
 template<typename char_type, size_t stack_size, size_t heap_block_size>
-TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator
+typename TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator
 TextStreamBase<char_type, stack_size, heap_block_size>::const_iterator::operator--(int)
 {
 	const_iterator old(*this);