From b442db41ec969d06dbbe1a5037d00cfc1af6d503 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Mon, 1 Sep 2014 16:26:47 +1000
Subject: [PATCH] pascal: move ostream operators to util namespace

---
 pascal.cpp | 17 ++++++++++-------
 pascal.hpp |  5 +++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pascal.cpp b/pascal.cpp
index b384c63b..c0d22885 100644
--- a/pascal.cpp
+++ b/pascal.cpp
@@ -101,22 +101,25 @@ parray<T>::cend (void) const {
 //-----------------------------------------------------------------------------
 template <typename T>
 std::ostream&
-operator<< (std::ostream &os, parray<T> p) {
+util::operator<< (std::ostream &os, parray<T> p) {
     os << "[" << p.size << ", " << std::hex << p.data << std::dec << "]";
     return os;
 }
 
 
-template std::ostream& operator<< (std::ostream&, parray<uint16_t>);
-template std::ostream& operator<< (std::ostream&, parray<uint32_t>);
-template std::ostream& operator<< (std::ostream&, parray<uint64_t>);
+template std::ostream& util::operator<< (std::ostream&, parray<uint16_t>);
+template std::ostream& util::operator<< (std::ostream&, parray<uint32_t>);
+template std::ostream& util::operator<< (std::ostream&, parray<uint64_t>);
 
-template std::ostream& operator<< (std::ostream&, parray<const uint16_t>);
-template std::ostream& operator<< (std::ostream&, parray<const uint32_t>);
-template std::ostream& operator<< (std::ostream&, parray<const uint64_t>);
+template std::ostream& util::operator<< (std::ostream&, parray<const uint16_t>);
+template std::ostream& util::operator<< (std::ostream&, parray<const uint32_t>);
+template std::ostream& util::operator<< (std::ostream&, parray<const uint64_t>);
 
 //-----------------------------------------------------------------------------
 namespace util {
+    template struct parray<char>;
+    template struct parray<const char>;
+
     template struct parray<int8_t>;
     template struct parray<int16_t>;
     template struct parray<int32_t>;
diff --git a/pascal.hpp b/pascal.hpp
index b79293fb..22a5f74d 100644
--- a/pascal.hpp
+++ b/pascal.hpp
@@ -43,9 +43,10 @@ namespace util {
         const T* cbegin (void) const;
         const T* cend   (void) const;
     };
+
+    template <typename T>
+    std::ostream& operator<< (std::ostream&, util::parray<T>);
 }
 
-template <typename T>
-std::ostream& operator<< (std::ostream&, util::parray<T>);
 
 #endif