From 0d9a21ea08143054683a0eae55f88329f4f6e40b Mon Sep 17 00:00:00 2001
From: Takatoshi Kondo <redboltz@gmail.com>
Date: Sun, 8 Mar 2015 20:49:40 +0900
Subject: [PATCH] Added msgpack prefix to packer.

---
 erb/cpp03_define.hpp.erb                      |   2 +-
 erb/cpp03_msgpack_tuple.hpp.erb               |   8 +-
 erb/cpp03_msgpack_tuple_fwd.hpp.erb           |   8 +-
 include/msgpack/adaptor/bool.hpp              |   2 +-
 include/msgpack/adaptor/bool_fwd.hpp          |   2 +-
 include/msgpack/adaptor/char_ptr.hpp          |   2 +-
 include/msgpack/adaptor/char_ptr_fwd.hpp      |   2 +-
 include/msgpack/adaptor/cpp11/array.hpp       |   2 +-
 include/msgpack/adaptor/cpp11/array_char.hpp  |   2 +-
 .../msgpack/adaptor/cpp11/array_char_fwd.hpp  |   2 +-
 include/msgpack/adaptor/cpp11/array_fwd.hpp   |   2 +-
 .../msgpack/adaptor/cpp11/forward_list.hpp    |   2 +-
 .../adaptor/cpp11/forward_list_fwd.hpp        |   2 +-
 include/msgpack/adaptor/cpp11/tuple.hpp       |  12 +-
 include/msgpack/adaptor/cpp11/tuple_fwd.hpp   |   6 +-
 .../msgpack/adaptor/cpp11/unordered_map.hpp   |   4 +-
 .../adaptor/cpp11/unordered_map_fwd.hpp       |   4 +-
 .../msgpack/adaptor/cpp11/unordered_set.hpp   |   4 +-
 .../adaptor/cpp11/unordered_set_fwd.hpp       |   4 +-
 include/msgpack/adaptor/deque.hpp             |   2 +-
 include/msgpack/adaptor/deque_fwd.hpp         |   2 +-
 .../msgpack/adaptor/detail/cpp03_define.hpp   |   2 +-
 .../adaptor/detail/cpp03_msgpack_tuple.hpp    | 132 +++++++++---------
 .../detail/cpp03_msgpack_tuple_fwd.hpp        | 132 +++++++++---------
 .../msgpack/adaptor/detail/cpp11_define.hpp   |   2 +-
 .../adaptor/detail/cpp11_msgpack_tuple.hpp    |  12 +-
 .../detail/cpp11_msgpack_tuple_fwd.hpp        |   4 +-
 include/msgpack/adaptor/fixint.hpp            |  16 +--
 include/msgpack/adaptor/fixint_fwd.hpp        |  16 +--
 include/msgpack/adaptor/float.hpp             |   4 +-
 include/msgpack/adaptor/float_fwd.hpp         |   4 +-
 include/msgpack/adaptor/int.hpp               |  22 +--
 include/msgpack/adaptor/int_fwd.hpp           |  22 +--
 include/msgpack/adaptor/list.hpp              |   2 +-
 include/msgpack/adaptor/list_fwd.hpp          |   2 +-
 include/msgpack/adaptor/map.hpp               |   6 +-
 include/msgpack/adaptor/map_fwd.hpp           |   6 +-
 include/msgpack/adaptor/nil.hpp               |   2 +-
 include/msgpack/adaptor/nil_fwd.hpp           |   2 +-
 include/msgpack/adaptor/pair.hpp              |   2 +-
 include/msgpack/adaptor/pair_fwd.hpp          |   2 +-
 include/msgpack/adaptor/raw.hpp               |   2 +-
 include/msgpack/adaptor/raw_fwd.hpp           |   2 +-
 include/msgpack/adaptor/set.hpp               |   4 +-
 include/msgpack/adaptor/set_fwd.hpp           |   4 +-
 include/msgpack/adaptor/string.hpp            |   2 +-
 include/msgpack/adaptor/string_fwd.hpp        |   2 +-
 include/msgpack/adaptor/tr1/unordered_map.hpp |   4 +-
 .../msgpack/adaptor/tr1/unordered_map_fwd.hpp |   4 +-
 include/msgpack/adaptor/tr1/unordered_set.hpp |   4 +-
 .../msgpack/adaptor/tr1/unordered_set_fwd.hpp |   4 +-
 include/msgpack/adaptor/vector.hpp            |   2 +-
 include/msgpack/adaptor/vector_char.hpp       |   2 +-
 include/msgpack/adaptor/vector_char_fwd.hpp   |   2 +-
 include/msgpack/adaptor/vector_fwd.hpp        |   2 +-
 include/msgpack/object.hpp                    |  10 +-
 56 files changed, 259 insertions(+), 259 deletions(-)

diff --git a/erb/cpp03_define.hpp.erb b/erb/cpp03_define.hpp.erb
index ad2abf5d..e2f945b9 100644
--- a/erb/cpp03_define.hpp.erb
+++ b/erb/cpp03_define.hpp.erb
@@ -61,7 +61,7 @@
     namespace detail { \
       template <typename Stream> \
       struct packer_serializer<Stream, enum> { \
-        static packer<Stream>& pack(packer<Stream>& o, const enum& v) { \
+        static msgpack::packer<Stream>& pack(msgpack::packer<Stream>& o, const enum& v) { \
           return o << static_cast<int>(v); \
         } \
       }; \
diff --git a/erb/cpp03_msgpack_tuple.hpp.erb b/erb/cpp03_msgpack_tuple.hpp.erb
index 9f86e6e9..e7752a5c 100644
--- a/erb/cpp03_msgpack_tuple.hpp.erb
+++ b/erb/cpp03_msgpack_tuple.hpp.erb
@@ -156,16 +156,16 @@ inline msgpack::object const& operator>> (
 <%}%>
 
 template <typename Stream>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<>&) {
     o.pack_array(0);
     return o;
 }
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename Stream, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v) {
     o.pack_array(<%=i+1%>);
     <%0.upto(i) {|j|%>
diff --git a/erb/cpp03_msgpack_tuple_fwd.hpp.erb b/erb/cpp03_msgpack_tuple_fwd.hpp.erb
index d5e7003b..901da817 100644
--- a/erb/cpp03_msgpack_tuple_fwd.hpp.erb
+++ b/erb/cpp03_msgpack_tuple_fwd.hpp.erb
@@ -89,14 +89,14 @@ msgpack::object const& operator>> (
 <%}%>
 
 template <typename Stream>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<>&);
 
 <%0.upto(GENERATION_LIMIT) {|i|%>
 template <typename Stream, typename A0<%1.upto(i) {|j|%>, typename A<%=j%><%}%>>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>>& v);
 <%}%>
 
diff --git a/include/msgpack/adaptor/bool.hpp b/include/msgpack/adaptor/bool.hpp
index 58c96cc9..583bf665 100644
--- a/include/msgpack/adaptor/bool.hpp
+++ b/include/msgpack/adaptor/bool.hpp
@@ -34,7 +34,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, bool& v)
 }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const bool& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const bool& v)
 {
     if(v) { o.pack_true(); }
     else { o.pack_false(); }
diff --git a/include/msgpack/adaptor/bool_fwd.hpp b/include/msgpack/adaptor/bool_fwd.hpp
index d57cebac..b25bfbc4 100644
--- a/include/msgpack/adaptor/bool_fwd.hpp
+++ b/include/msgpack/adaptor/bool_fwd.hpp
@@ -27,7 +27,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 
 msgpack::object const& operator>> (msgpack::object const& o, bool& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const bool& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const bool& v);
 void operator<< (msgpack::object& o, bool v);
 void operator<< (msgpack::object::with_zone& o, bool v);
 
diff --git a/include/msgpack/adaptor/char_ptr.hpp b/include/msgpack/adaptor/char_ptr.hpp
index 03f08141..1767d06b 100644
--- a/include/msgpack/adaptor/char_ptr.hpp
+++ b/include/msgpack/adaptor/char_ptr.hpp
@@ -27,7 +27,7 @@ namespace msgpack {
 MSGPACK_API_VERSION_NAMESPACE(v1) {
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const char* v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const char* v)
 {
     std::size_t size = std::strlen(v);
     o.pack_str(size);
diff --git a/include/msgpack/adaptor/char_ptr_fwd.hpp b/include/msgpack/adaptor/char_ptr_fwd.hpp
index 3a8a8d58..b89419f1 100644
--- a/include/msgpack/adaptor/char_ptr_fwd.hpp
+++ b/include/msgpack/adaptor/char_ptr_fwd.hpp
@@ -27,7 +27,7 @@ namespace msgpack {
 MSGPACK_API_VERSION_NAMESPACE(v1) {
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const char* v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const char* v);
 void operator<< (msgpack::object::with_zone& o, const char* v);
 void operator<< (msgpack::object& o, const char* v);
 
diff --git a/include/msgpack/adaptor/cpp11/array.hpp b/include/msgpack/adaptor/cpp11/array.hpp
index 546da4af..6c92f0d8 100644
--- a/include/msgpack/adaptor/cpp11/array.hpp
+++ b/include/msgpack/adaptor/cpp11/array.hpp
@@ -46,7 +46,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::array<T
 }
 
 template <typename Stream, typename T, std::size_t N>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::array<T, N>& v) {
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::array<T, N>& v) {
     o.pack_array(v.size());
     for(auto const& e : v) o.pack(e);
     return o;
diff --git a/include/msgpack/adaptor/cpp11/array_char.hpp b/include/msgpack/adaptor/cpp11/array_char.hpp
index 7977d7b4..34f44500 100644
--- a/include/msgpack/adaptor/cpp11/array_char.hpp
+++ b/include/msgpack/adaptor/cpp11/array_char.hpp
@@ -46,7 +46,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::array<c
 }
 
 template <typename Stream, std::size_t N>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::array<char, N>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::array<char, N>& v)
 {
     o.pack_bin(v.size());
     o.pack_bin_body(v.data(), v.size());
diff --git a/include/msgpack/adaptor/cpp11/array_char_fwd.hpp b/include/msgpack/adaptor/cpp11/array_char_fwd.hpp
index 669f5cfc..3bf3fe68 100644
--- a/include/msgpack/adaptor/cpp11/array_char_fwd.hpp
+++ b/include/msgpack/adaptor/cpp11/array_char_fwd.hpp
@@ -30,7 +30,7 @@ template <std::size_t N>
 msgpack::object const& operator>> (msgpack::object const& o, std::array<char, N>& v);
 
 template <typename Stream, std::size_t N>
-packer<Stream>& operator<< (packer<Stream>& o, const std::array<char, N>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::array<char, N>& v);
 
 template <std::size_t N>
 void operator<< (msgpack::object& o, const std::array<char, N>& v);
diff --git a/include/msgpack/adaptor/cpp11/array_fwd.hpp b/include/msgpack/adaptor/cpp11/array_fwd.hpp
index 579c0702..a395c3f0 100644
--- a/include/msgpack/adaptor/cpp11/array_fwd.hpp
+++ b/include/msgpack/adaptor/cpp11/array_fwd.hpp
@@ -32,7 +32,7 @@ template <typename T, std::size_t N>
 msgpack::object const& operator>> (msgpack::object const& o, std::array<T, N>& v);
 
 template <typename Stream, typename T, std::size_t N>
-packer<Stream>& operator<< (packer<Stream>& o, const std::array<T, N>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::array<T, N>& v);
 
 template <typename T, std::size_t N>
 void operator<< (msgpack::object::with_zone& o, const std::array<T, N>& v);
diff --git a/include/msgpack/adaptor/cpp11/forward_list.hpp b/include/msgpack/adaptor/cpp11/forward_list.hpp
index 99d3fe95..b8e5f61c 100644
--- a/include/msgpack/adaptor/cpp11/forward_list.hpp
+++ b/include/msgpack/adaptor/cpp11/forward_list.hpp
@@ -42,7 +42,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::forward
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::forward_list<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::forward_list<T>& v)
 {
     o.pack_array(std::distance(v.begin(), v.end()));
     for(auto const& e : v) o.pack(e);
diff --git a/include/msgpack/adaptor/cpp11/forward_list_fwd.hpp b/include/msgpack/adaptor/cpp11/forward_list_fwd.hpp
index cebf7b43..e9d9a1ac 100644
--- a/include/msgpack/adaptor/cpp11/forward_list_fwd.hpp
+++ b/include/msgpack/adaptor/cpp11/forward_list_fwd.hpp
@@ -32,7 +32,7 @@ template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, std::forward_list<T>& v);
 
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const std::forward_list<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::forward_list<T>& v);
 
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const std::forward_list<T>& v);
diff --git a/include/msgpack/adaptor/cpp11/tuple.hpp b/include/msgpack/adaptor/cpp11/tuple.hpp
index 79c58e59..49875d78 100644
--- a/include/msgpack/adaptor/cpp11/tuple.hpp
+++ b/include/msgpack/adaptor/cpp11/tuple.hpp
@@ -27,11 +27,11 @@ namespace msgpack {
 
 MSGPACK_API_VERSION_NAMESPACE(v1) {
 
-// --- Pack ( from tuple to packer stream ---
+// --- Pack from tuple to packer stream ---
 template <typename Stream, typename Tuple, std::size_t N>
 struct StdTuplePacker {
     static void pack(
-        packer<Stream>& o,
+        msgpack::packer<Stream>& o,
         const Tuple& v) {
         StdTuplePacker<Stream, Tuple, N-1>::pack(o, v);
         o.pack(std::get<N-1>(v));
@@ -41,7 +41,7 @@ struct StdTuplePacker {
 template <typename Stream, typename Tuple>
 struct StdTuplePacker<Stream, Tuple, 1> {
     static void pack (
-        packer<Stream>& o,
+        msgpack::packer<Stream>& o,
         const Tuple& v) {
         o.pack(std::get<0>(v));
     }
@@ -50,15 +50,15 @@ struct StdTuplePacker<Stream, Tuple, 1> {
 template <typename Stream, typename Tuple>
 struct StdTuplePacker<Stream, Tuple, 0> {
     static void pack (
-        packer<Stream>&,
+        msgpack::packer<Stream>&,
         const Tuple&) {
     }
 };
 
 
 template <typename Stream, typename... Args>
-inline const packer<Stream>& operator<< (
-    packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const std::tuple<Args...>& v) {
     o.pack_array(sizeof...(Args));
     StdTuplePacker<Stream, decltype(v), sizeof...(Args)>::pack(o, v);
diff --git a/include/msgpack/adaptor/cpp11/tuple_fwd.hpp b/include/msgpack/adaptor/cpp11/tuple_fwd.hpp
index 020f8094..f19423c2 100644
--- a/include/msgpack/adaptor/cpp11/tuple_fwd.hpp
+++ b/include/msgpack/adaptor/cpp11/tuple_fwd.hpp
@@ -27,13 +27,13 @@ namespace msgpack {
 
 MSGPACK_API_VERSION_NAMESPACE(v1) {
 
-// --- Pack ( from tuple to packer stream ---
+// --- Pack from tuple to packer stream ---
 template <typename Stream, typename Tuple, std::size_t N>
 struct StdTuplePacker;
 
 template <typename Stream, typename... Args>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const std::tuple<Args...>& v);
 
 // --- Convert from tuple to object ---
diff --git a/include/msgpack/adaptor/cpp11/unordered_map.hpp b/include/msgpack/adaptor/cpp11/unordered_map.hpp
index a6efca0a..eb52354b 100644
--- a/include/msgpack/adaptor/cpp11/unordered_map.hpp
+++ b/include/msgpack/adaptor/cpp11/unordered_map.hpp
@@ -44,7 +44,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::unorder
 }
 
 template <typename Stream, typename K, typename V>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::unordered_map<K,V>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::unordered_map<K,V>& v)
 {
     o.pack_map(v.size());
     for(typename std::unordered_map<K,V>::const_iterator it(v.begin()), it_end(v.end());
@@ -96,7 +96,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::unorder
 }
 
 template <typename Stream, typename K, typename V>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::unordered_multimap<K,V>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::unordered_multimap<K,V>& v)
 {
     o.pack_map(v.size());
     for(typename std::unordered_multimap<K,V>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp b/include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp
index 1e016123..e031f220 100644
--- a/include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp
+++ b/include/msgpack/adaptor/cpp11/unordered_map_fwd.hpp
@@ -31,7 +31,7 @@ template <typename K, typename V>
 msgpack::object const& operator>> (msgpack::object const& o, std::unordered_map<K, V>& v);
 
 template <typename Stream, typename K, typename V>
-packer<Stream>& operator<< (packer<Stream>& o, const std::unordered_map<K,V>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::unordered_map<K,V>& v);
 
 template <typename K, typename V>
 void operator<< (msgpack::object::with_zone& o, const std::unordered_map<K,V>& v);
@@ -40,7 +40,7 @@ template <typename K, typename V>
 msgpack::object const& operator>> (msgpack::object const& o, std::unordered_multimap<K, V>& v);
 
 template <typename Stream, typename K, typename V>
-packer<Stream>& operator<< (packer<Stream>& o, const std::unordered_multimap<K,V>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::unordered_multimap<K,V>& v);
 
 template <typename K, typename V>
 void operator<< (msgpack::object::with_zone& o, const std::unordered_multimap<K,V>& v);
diff --git a/include/msgpack/adaptor/cpp11/unordered_set.hpp b/include/msgpack/adaptor/cpp11/unordered_set.hpp
index 9bba97df..5a98d117 100644
--- a/include/msgpack/adaptor/cpp11/unordered_set.hpp
+++ b/include/msgpack/adaptor/cpp11/unordered_set.hpp
@@ -43,7 +43,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::unorder
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::unordered_set<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::unordered_set<T>& v)
 {
     o.pack_array(v.size());
     for(typename std::unordered_set<T>::const_iterator it(v.begin()), it_end(v.end());
@@ -91,7 +91,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::unorder
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::unordered_multiset<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::unordered_multiset<T>& v)
 {
     o.pack_array(v.size());
     for(typename std::unordered_multiset<T>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp b/include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp
index 26e82a97..d8980136 100644
--- a/include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp
+++ b/include/msgpack/adaptor/cpp11/unordered_set_fwd.hpp
@@ -31,7 +31,7 @@ template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, std::unordered_set<T>& v);
 
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const std::unordered_set<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::unordered_set<T>& v);
 
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const std::unordered_set<T>& v);
@@ -40,7 +40,7 @@ template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, std::unordered_multiset<T>& v);
 
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const std::unordered_multiset<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::unordered_multiset<T>& v);
 
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const std::unordered_multiset<T>& v);
diff --git a/include/msgpack/adaptor/deque.hpp b/include/msgpack/adaptor/deque.hpp
index 2e6f5464..f1b94a6f 100644
--- a/include/msgpack/adaptor/deque.hpp
+++ b/include/msgpack/adaptor/deque.hpp
@@ -41,7 +41,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::deque<T
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::deque<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::deque<T>& v)
 {
     o.pack_array(v.size());
     for(typename std::deque<T>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/deque_fwd.hpp b/include/msgpack/adaptor/deque_fwd.hpp
index 651869df..2be801c4 100644
--- a/include/msgpack/adaptor/deque_fwd.hpp
+++ b/include/msgpack/adaptor/deque_fwd.hpp
@@ -29,7 +29,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, std::deque<T>& v);
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const std::deque<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::deque<T>& v);
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const std::deque<T>& v);
 
diff --git a/include/msgpack/adaptor/detail/cpp03_define.hpp b/include/msgpack/adaptor/detail/cpp03_define.hpp
index 183ac104..1f87123b 100644
--- a/include/msgpack/adaptor/detail/cpp03_define.hpp
+++ b/include/msgpack/adaptor/detail/cpp03_define.hpp
@@ -61,7 +61,7 @@
     namespace detail { \
       template <typename Stream> \
       struct packer_serializer<Stream, enum> { \
-        static packer<Stream>& pack(packer<Stream>& o, const enum& v) { \
+        static msgpack::packer<Stream>& pack(msgpack::packer<Stream>& o, const enum& v) { \
           return o << static_cast<int>(v); \
         } \
       }; \
diff --git a/include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp b/include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp
index bf0e1664..9c02e550 100644
--- a/include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp
+++ b/include/msgpack/adaptor/detail/cpp03_msgpack_tuple.hpp
@@ -11440,16 +11440,16 @@ inline msgpack::object const& operator>> (
 
 
 template <typename Stream>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<>&) {
     o.pack_array(0);
     return o;
 }
 
 template <typename Stream, typename A0>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0>& v) {
     o.pack_array(1);
     
@@ -11458,8 +11458,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1>& v) {
     o.pack_array(2);
     
@@ -11469,8 +11469,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2>& v) {
     o.pack_array(3);
     
@@ -11481,8 +11481,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3>& v) {
     o.pack_array(4);
     
@@ -11494,8 +11494,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4>& v) {
     o.pack_array(5);
     
@@ -11508,8 +11508,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5>& v) {
     o.pack_array(6);
     
@@ -11523,8 +11523,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6>& v) {
     o.pack_array(7);
     
@@ -11539,8 +11539,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7>& v) {
     o.pack_array(8);
     
@@ -11556,8 +11556,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8>& v) {
     o.pack_array(9);
     
@@ -11574,8 +11574,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9>& v) {
     o.pack_array(10);
     
@@ -11593,8 +11593,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>& v) {
     o.pack_array(11);
     
@@ -11613,8 +11613,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>& v) {
     o.pack_array(12);
     
@@ -11634,8 +11634,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12>& v) {
     o.pack_array(13);
     
@@ -11656,8 +11656,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13>& v) {
     o.pack_array(14);
     
@@ -11679,8 +11679,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14>& v) {
     o.pack_array(15);
     
@@ -11703,8 +11703,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15>& v) {
     o.pack_array(16);
     
@@ -11728,8 +11728,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16>& v) {
     o.pack_array(17);
     
@@ -11754,8 +11754,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17>& v) {
     o.pack_array(18);
     
@@ -11781,8 +11781,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18>& v) {
     o.pack_array(19);
     
@@ -11809,8 +11809,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19>& v) {
     o.pack_array(20);
     
@@ -11838,8 +11838,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20>& v) {
     o.pack_array(21);
     
@@ -11868,8 +11868,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21>& v) {
     o.pack_array(22);
     
@@ -11899,8 +11899,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22>& v) {
     o.pack_array(23);
     
@@ -11931,8 +11931,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23>& v) {
     o.pack_array(24);
     
@@ -11964,8 +11964,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24>& v) {
     o.pack_array(25);
     
@@ -11998,8 +11998,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25>& v) {
     o.pack_array(26);
     
@@ -12033,8 +12033,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26>& v) {
     o.pack_array(27);
     
@@ -12069,8 +12069,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27>& v) {
     o.pack_array(28);
     
@@ -12106,8 +12106,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27, typename A28>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28>& v) {
     o.pack_array(29);
     
@@ -12144,8 +12144,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27, typename A28, typename A29>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29>& v) {
     o.pack_array(30);
     
@@ -12183,8 +12183,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27, typename A28, typename A29, typename A30>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30>& v) {
     o.pack_array(31);
     
@@ -12223,8 +12223,8 @@ inline const packer<Stream>& operator<< (
 }
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27, typename A28, typename A29, typename A30, typename A31>
-inline const packer<Stream>& operator<< (
-        packer<Stream>& o,
+inline const msgpack::packer<Stream>& operator<< (
+        msgpack::packer<Stream>& o,
         const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30, A31>& v) {
     o.pack_array(32);
     
diff --git a/include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp b/include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp
index 88f6413f..c5b8d8f4 100644
--- a/include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp
+++ b/include/msgpack/adaptor/detail/cpp03_msgpack_tuple_fwd.hpp
@@ -3871,169 +3871,169 @@ msgpack::object const& operator>> (
 
 
 template <typename Stream>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<>&);
 
 
 template <typename Stream, typename A0>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0>& v);
 
 template <typename Stream, typename A0, typename A1>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27, typename A28>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27, typename A28, typename A29>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27, typename A28, typename A29, typename A30>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30>& v);
 
 template <typename Stream, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename A14, typename A15, typename A16, typename A17, typename A18, typename A19, typename A20, typename A21, typename A22, typename A23, typename A24, typename A25, typename A26, typename A27, typename A28, typename A29, typename A30, typename A31>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30, A31>& v);
 
 
diff --git a/include/msgpack/adaptor/detail/cpp11_define.hpp b/include/msgpack/adaptor/detail/cpp11_define.hpp
index 00dd948a..8c18c577 100644
--- a/include/msgpack/adaptor/detail/cpp11_define.hpp
+++ b/include/msgpack/adaptor/detail/cpp11_define.hpp
@@ -67,7 +67,7 @@
     namespace detail { \
       template <typename Stream> \
       struct packer_serializer<Stream, enum> { \
-        static packer<Stream>& pack(packer<Stream>& o, const enum& v) { \
+        static msgpack::packer<Stream>& pack(msgpack::packer<Stream>& o, const enum& v) { \
           return o << static_cast<std::underlying_type<enum>::type>(v); \
         } \
       }; \
diff --git a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
index 2e9dcb34..d79af202 100644
--- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
+++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
@@ -91,11 +91,11 @@ namespace type {
     }
 } // namespace type
 
-// --- Pack ( from tuple to packer stream ---
+// --- Pack from tuple to packer stream ---
 template <typename Stream, typename Tuple, std::size_t N>
 struct MsgpackTuplePacker {
     static void pack(
-        packer<Stream>& o,
+        msgpack::packer<Stream>& o,
         const Tuple& v) {
         MsgpackTuplePacker<Stream, Tuple, N-1>::pack(o, v);
         o.pack(type::get<N-1>(v));
@@ -105,7 +105,7 @@ struct MsgpackTuplePacker {
 template <typename Stream, typename Tuple>
 struct MsgpackTuplePacker<Stream, Tuple, 1> {
     static void pack (
-        packer<Stream>& o,
+        msgpack::packer<Stream>& o,
         const Tuple& v) {
         o.pack(type::get<0>(v));
     }
@@ -114,14 +114,14 @@ struct MsgpackTuplePacker<Stream, Tuple, 1> {
 template <typename Stream, typename Tuple>
 struct MsgpackTuplePacker<Stream, Tuple, 0> {
     static void pack (
-        packer<Stream>&,
+        msgpack::packer<Stream>&,
         const Tuple&) {
     }
 };
 
 template <typename Stream, typename... Args>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<Args...>& v) {
     o.pack_array(sizeof...(Args));
     MsgpackTuplePacker<Stream, decltype(v), sizeof...(Args)>::pack(o, v);
diff --git a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp
index 5b144511..fb65cd29 100644
--- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp
+++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple_fwd.hpp
@@ -54,8 +54,8 @@ template <typename Stream, typename Tuple, std::size_t N>
 struct MsgpackTuplePacker;
 
 template <typename Stream, typename... Args>
-const packer<Stream>& operator<< (
-    packer<Stream>& o,
+const msgpack::packer<Stream>& operator<< (
+    msgpack::packer<Stream>& o,
     const type::tuple<Args...>& v);
 
 // --- Convert from tuple to object ---
diff --git a/include/msgpack/adaptor/fixint.hpp b/include/msgpack/adaptor/fixint.hpp
index 243c8f0b..7a78f0f8 100644
--- a/include/msgpack/adaptor/fixint.hpp
+++ b/include/msgpack/adaptor/fixint.hpp
@@ -84,36 +84,36 @@ inline msgpack::object const& operator>> (msgpack::object const& o, type::fix_ui
 
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::fix_int8& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_int8& v)
     { o.pack_fix_int8(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::fix_int16& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_int16& v)
     { o.pack_fix_int16(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::fix_int32& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_int32& v)
     { o.pack_fix_int32(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::fix_int64& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_int64& v)
     { o.pack_fix_int64(v); return o; }
 
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::fix_uint8& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_uint8& v)
     { o.pack_fix_uint8(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::fix_uint16& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_uint16& v)
     { o.pack_fix_uint16(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::fix_uint32& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_uint32& v)
     { o.pack_fix_uint32(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::fix_uint64& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_uint64& v)
     { o.pack_fix_uint64(v); return o; }
 
 
diff --git a/include/msgpack/adaptor/fixint_fwd.hpp b/include/msgpack/adaptor/fixint_fwd.hpp
index fe4dbbee..252f59d8 100644
--- a/include/msgpack/adaptor/fixint_fwd.hpp
+++ b/include/msgpack/adaptor/fixint_fwd.hpp
@@ -56,22 +56,22 @@ msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint32& v
 msgpack::object const& operator>> (msgpack::object const& o, type::fix_uint64& v);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::fix_int8& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_int8& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::fix_int16& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_int16& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::fix_int32& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_int32& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::fix_int64& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_int64& v);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::fix_uint8& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_uint8& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::fix_uint16& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_uint16& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::fix_uint32& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_uint32& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::fix_uint64& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::fix_uint64& v);
 
 void operator<< (msgpack::object& o, type::fix_int8 v);
 void operator<< (msgpack::object& o, type::fix_int16 v);
diff --git a/include/msgpack/adaptor/float.hpp b/include/msgpack/adaptor/float.hpp
index 7ecadbb8..a409d351 100644
--- a/include/msgpack/adaptor/float.hpp
+++ b/include/msgpack/adaptor/float.hpp
@@ -47,7 +47,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, float& v)
 }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const float& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const float& v)
 {
     o.pack_float(v);
     return o;
@@ -72,7 +72,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, double& v)
 }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const double& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const double& v)
 {
     o.pack_double(v);
     return o;
diff --git a/include/msgpack/adaptor/float_fwd.hpp b/include/msgpack/adaptor/float_fwd.hpp
index fde8816e..58c21b84 100644
--- a/include/msgpack/adaptor/float_fwd.hpp
+++ b/include/msgpack/adaptor/float_fwd.hpp
@@ -28,10 +28,10 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 
 msgpack::object const& operator>> (msgpack::object const& o, float& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const float& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const float& v);
 msgpack::object const& operator>> (msgpack::object const& o, double& v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const double& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const double& v);
 void operator<< (msgpack::object& o, float v);
 void operator<< (msgpack::object& o, double v);
 void operator<< (msgpack::object::with_zone& o, float v);
diff --git a/include/msgpack/adaptor/int.hpp b/include/msgpack/adaptor/int.hpp
index eb3d775e..88b79a81 100644
--- a/include/msgpack/adaptor/int.hpp
+++ b/include/msgpack/adaptor/int.hpp
@@ -138,49 +138,49 @@ inline msgpack::object const& operator>> (msgpack::object const& o, unsigned lon
 
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, char v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, char v)
     { o.pack_char(v); return o; }
 
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, signed char v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed char v)
     { o.pack_signed_char(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, signed short v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed short v)
     { o.pack_short(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, signed int v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed int v)
     { o.pack_int(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, signed long v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed long v)
     { o.pack_long(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, signed long long v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed long long v)
     { o.pack_long_long(v); return o; }
 
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, unsigned char v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned char v)
     { o.pack_unsigned_char(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, unsigned short v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned short v)
     { o.pack_unsigned_short(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, unsigned int v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned int v)
     { o.pack_unsigned_int(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, unsigned long v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned long v)
     { o.pack_unsigned_long(v); return o; }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, unsigned long long v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned long long v)
     { o.pack_unsigned_long_long(v); return o; }
 
 
diff --git a/include/msgpack/adaptor/int_fwd.hpp b/include/msgpack/adaptor/int_fwd.hpp
index 91cde52b..891caa03 100644
--- a/include/msgpack/adaptor/int_fwd.hpp
+++ b/include/msgpack/adaptor/int_fwd.hpp
@@ -40,29 +40,29 @@ msgpack::object const& operator>> (msgpack::object const& o, unsigned long& v);
 msgpack::object const& operator>> (msgpack::object const& o, unsigned long long& v);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, char v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, char v);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, signed char v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed char v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, signed short v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed short v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, signed int v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed int v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, signed long v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed long v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, signed long long v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, signed long long v);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, unsigned char v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned char v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, unsigned short v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned short v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, unsigned int v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned int v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, unsigned long v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned long v);
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, unsigned long long v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, unsigned long long v);
 
 
 void operator<< (msgpack::object& o, char v);
diff --git a/include/msgpack/adaptor/list.hpp b/include/msgpack/adaptor/list.hpp
index 0cabdd86..4b5608c8 100644
--- a/include/msgpack/adaptor/list.hpp
+++ b/include/msgpack/adaptor/list.hpp
@@ -41,7 +41,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::list<T>
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::list<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::list<T>& v)
 {
     o.pack_array(v.size());
     for(typename std::list<T>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/list_fwd.hpp b/include/msgpack/adaptor/list_fwd.hpp
index 0caee166..3da2fb47 100644
--- a/include/msgpack/adaptor/list_fwd.hpp
+++ b/include/msgpack/adaptor/list_fwd.hpp
@@ -29,7 +29,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, std::list<T>& v);
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const std::list<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::list<T>& v);
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const std::list<T>& v);
 
diff --git a/include/msgpack/adaptor/map.hpp b/include/msgpack/adaptor/map.hpp
index f84d5dff..72d8675d 100644
--- a/include/msgpack/adaptor/map.hpp
+++ b/include/msgpack/adaptor/map.hpp
@@ -61,7 +61,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, type::assoc_
 }
 
 template <typename Stream, typename K, typename V>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::assoc_vector<K,V>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::assoc_vector<K,V>& v)
 {
     o.pack_map(v.size());
     for(typename type::assoc_vector<K,V>::const_iterator it(v.begin()), it_end(v.end());
@@ -119,7 +119,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::map<K,
 }
 
 template <typename Stream, typename K, typename V>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::map<K,V>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::map<K,V>& v)
 {
     o.pack_map(v.size());
     for(typename std::map<K,V>::const_iterator it(v.begin()), it_end(v.end());
@@ -171,7 +171,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::multima
 }
 
 template <typename Stream, typename K, typename V>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::multimap<K,V>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::multimap<K,V>& v)
 {
     o.pack_map(v.size());
     for(typename std::multimap<K,V>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/map_fwd.hpp b/include/msgpack/adaptor/map_fwd.hpp
index 525729e0..98148a34 100644
--- a/include/msgpack/adaptor/map_fwd.hpp
+++ b/include/msgpack/adaptor/map_fwd.hpp
@@ -44,21 +44,21 @@ namespace detail {
 template <typename K, typename V>
 msgpack::object const& operator>> (msgpack::object const& o, type::assoc_vector<K,V>& v);
 template <typename Stream, typename K, typename V>
-packer<Stream>& operator<< (packer<Stream>& o, const type::assoc_vector<K,V>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::assoc_vector<K,V>& v);
 template <typename K, typename V>
 void operator<< (msgpack::object::with_zone& o, const type::assoc_vector<K,V>& v);
 
 template <typename K, typename V>
 msgpack::object const& operator>> (msgpack::object const& o, std::map<K, V>& v);
 template <typename Stream, typename K, typename V>
-packer<Stream>& operator<< (packer<Stream>& o, const std::map<K,V>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::map<K,V>& v);
 template <typename K, typename V>
 void operator<< (msgpack::object::with_zone& o, const std::map<K,V>& v);
 
 template <typename K, typename V>
 msgpack::object const& operator>> (msgpack::object const& o, std::multimap<K, V>& v);
 template <typename Stream, typename K, typename V>
-packer<Stream>& operator<< (packer<Stream>& o, const std::multimap<K,V>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::multimap<K,V>& v);
 template <typename K, typename V>
 void operator<< (msgpack::object::with_zone& o, const std::multimap<K,V>& v);
 
diff --git a/include/msgpack/adaptor/nil.hpp b/include/msgpack/adaptor/nil.hpp
index 283ded76..9597058c 100644
--- a/include/msgpack/adaptor/nil.hpp
+++ b/include/msgpack/adaptor/nil.hpp
@@ -39,7 +39,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, type::nil&)
 }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const type::nil&)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::nil&)
 {
     o.pack_nil();
     return o;
diff --git a/include/msgpack/adaptor/nil_fwd.hpp b/include/msgpack/adaptor/nil_fwd.hpp
index cd406272..83459321 100644
--- a/include/msgpack/adaptor/nil_fwd.hpp
+++ b/include/msgpack/adaptor/nil_fwd.hpp
@@ -35,7 +35,7 @@ struct nil;
 msgpack::object const& operator>> (msgpack::object const& o, type::nil&);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::nil&);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::nil&);
 
 void operator<< (msgpack::object& o, type::nil);
 
diff --git a/include/msgpack/adaptor/pair.hpp b/include/msgpack/adaptor/pair.hpp
index 67a8393c..199f5aa5 100644
--- a/include/msgpack/adaptor/pair.hpp
+++ b/include/msgpack/adaptor/pair.hpp
@@ -37,7 +37,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::pair<T1
 }
 
 template <typename Stream, typename T1, typename T2>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::pair<T1, T2>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::pair<T1, T2>& v)
 {
     o.pack_array(2);
     o.pack(v.first);
diff --git a/include/msgpack/adaptor/pair_fwd.hpp b/include/msgpack/adaptor/pair_fwd.hpp
index 878a6b63..deea93d1 100644
--- a/include/msgpack/adaptor/pair_fwd.hpp
+++ b/include/msgpack/adaptor/pair_fwd.hpp
@@ -30,7 +30,7 @@ template <typename T1, typename T2>
 msgpack::object const& operator>> (msgpack::object const& o, std::pair<T1, T2>& v);
 
 template <typename Stream, typename T1, typename T2>
-packer<Stream>& operator<< (packer<Stream>& o, const std::pair<T1, T2>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::pair<T1, T2>& v);
 
 template <typename T1, typename T2>
 void operator<< (msgpack::object::with_zone& o, const std::pair<T1, T2>& v);
diff --git a/include/msgpack/adaptor/raw.hpp b/include/msgpack/adaptor/raw.hpp
index bc2dfeab..15390aca 100644
--- a/include/msgpack/adaptor/raw.hpp
+++ b/include/msgpack/adaptor/raw.hpp
@@ -73,7 +73,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, msgpack::typ
 }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const msgpack::type::raw_ref& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const msgpack::type::raw_ref& v)
 {
     o.pack_bin(v.size);
     o.pack_bin_body(v.ptr, v.size);
diff --git a/include/msgpack/adaptor/raw_fwd.hpp b/include/msgpack/adaptor/raw_fwd.hpp
index d9b08f1b..9441756c 100644
--- a/include/msgpack/adaptor/raw_fwd.hpp
+++ b/include/msgpack/adaptor/raw_fwd.hpp
@@ -37,7 +37,7 @@ struct raw_ref;
 msgpack::object const& operator>> (msgpack::object const& o, type::raw_ref& v);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const type::raw_ref& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const type::raw_ref& v);
 
 void operator<< (msgpack::object& o, const type::raw_ref& v);
 
diff --git a/include/msgpack/adaptor/set.hpp b/include/msgpack/adaptor/set.hpp
index 9e069d97..ca89d573 100644
--- a/include/msgpack/adaptor/set.hpp
+++ b/include/msgpack/adaptor/set.hpp
@@ -43,7 +43,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::set<T>&
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::set<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::set<T>& v)
 {
     o.pack_array(v.size());
     for(typename std::set<T>::const_iterator it(v.begin()), it_end(v.end());
@@ -91,7 +91,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::multise
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::multiset<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::multiset<T>& v)
 {
     o.pack_array(v.size());
     for(typename std::multiset<T>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/set_fwd.hpp b/include/msgpack/adaptor/set_fwd.hpp
index 3cbad77a..da48db58 100644
--- a/include/msgpack/adaptor/set_fwd.hpp
+++ b/include/msgpack/adaptor/set_fwd.hpp
@@ -31,7 +31,7 @@ template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, std::set<T>& v);
 
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const std::set<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::set<T>& v);
 
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const std::set<T>& v);
@@ -40,7 +40,7 @@ template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, std::multiset<T>& v);
 
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const std::multiset<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::multiset<T>& v);
 
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const std::multiset<T>& v);
diff --git a/include/msgpack/adaptor/string.hpp b/include/msgpack/adaptor/string.hpp
index 18d77b7d..a179a55c 100644
--- a/include/msgpack/adaptor/string.hpp
+++ b/include/msgpack/adaptor/string.hpp
@@ -43,7 +43,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::string&
 }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::string& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::string& v)
 {
     o.pack_str(v.size());
     o.pack_str_body(v.data(), v.size());
diff --git a/include/msgpack/adaptor/string_fwd.hpp b/include/msgpack/adaptor/string_fwd.hpp
index 574e665c..6938b338 100644
--- a/include/msgpack/adaptor/string_fwd.hpp
+++ b/include/msgpack/adaptor/string_fwd.hpp
@@ -29,7 +29,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 msgpack::object const& operator>> (msgpack::object const& o, std::string& v);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const std::string& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::string& v);
 
 void operator<< (msgpack::object::with_zone& o, const std::string& v);
 
diff --git a/include/msgpack/adaptor/tr1/unordered_map.hpp b/include/msgpack/adaptor/tr1/unordered_map.hpp
index e0ffd196..030d2bb1 100644
--- a/include/msgpack/adaptor/tr1/unordered_map.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_map.hpp
@@ -63,7 +63,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_
 }
 
 template <typename Stream, typename K, typename V>
-inline packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_map<K,V>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const MSGPACK_STD_TR1::unordered_map<K,V>& v)
 {
     o.pack_map(v.size());
     for(typename MSGPACK_STD_TR1::unordered_map<K,V>::const_iterator it(v.begin()), it_end(v.end());
@@ -115,7 +115,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_
 }
 
 template <typename Stream, typename K, typename V>
-inline packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multimap<K,V>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multimap<K,V>& v)
 {
     o.pack_map(v.size());
     for(typename MSGPACK_STD_TR1::unordered_multimap<K,V>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp b/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp
index 2c3499ec..e7edbd8d 100644
--- a/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_map_fwd.hpp
@@ -50,7 +50,7 @@ template <typename K, typename V>
 msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_map<K, V>& v);
 
 template <typename Stream, typename K, typename V>
-packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_map<K,V>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const MSGPACK_STD_TR1::unordered_map<K,V>& v);
 
 template <typename K, typename V>
 void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_map<K,V>& v);
@@ -59,7 +59,7 @@ template <typename K, typename V>
 msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_multimap<K, V>& v);
 
 template <typename Stream, typename K, typename V>
-packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multimap<K,V>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multimap<K,V>& v);
 
 template <typename K, typename V>
 void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_multimap<K,V>& v);
diff --git a/include/msgpack/adaptor/tr1/unordered_set.hpp b/include/msgpack/adaptor/tr1/unordered_set.hpp
index edfa242c..8a6098ad 100644
--- a/include/msgpack/adaptor/tr1/unordered_set.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_set.hpp
@@ -62,7 +62,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_set<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const MSGPACK_STD_TR1::unordered_set<T>& v)
 {
     o.pack_array(v.size());
     for(typename MSGPACK_STD_TR1::unordered_set<T>::const_iterator it(v.begin()), it_end(v.end());
@@ -110,7 +110,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multiset<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multiset<T>& v)
 {
     o.pack_array(v.size());
     for(typename MSGPACK_STD_TR1::unordered_multiset<T>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp b/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp
index 8dd9630c..fa06e8c4 100644
--- a/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_set_fwd.hpp
@@ -50,7 +50,7 @@ template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_set<T>& v);
 
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_set<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const MSGPACK_STD_TR1::unordered_set<T>& v);
 
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_set<T>& v);
@@ -59,7 +59,7 @@ template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, MSGPACK_STD_TR1::unordered_multiset<T>& v);
 
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multiset<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const MSGPACK_STD_TR1::unordered_multiset<T>& v);
 
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const MSGPACK_STD_TR1::unordered_multiset<T>& v);
diff --git a/include/msgpack/adaptor/vector.hpp b/include/msgpack/adaptor/vector.hpp
index ebd80daa..3b335168 100644
--- a/include/msgpack/adaptor/vector.hpp
+++ b/include/msgpack/adaptor/vector.hpp
@@ -45,7 +45,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::vector<
 }
 
 template <typename Stream, typename T>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::vector<T>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::vector<T>& v)
 {
     o.pack_array(v.size());
     for(typename std::vector<T>::const_iterator it(v.begin()), it_end(v.end());
diff --git a/include/msgpack/adaptor/vector_char.hpp b/include/msgpack/adaptor/vector_char.hpp
index de569b43..fc174c2c 100644
--- a/include/msgpack/adaptor/vector_char.hpp
+++ b/include/msgpack/adaptor/vector_char.hpp
@@ -45,7 +45,7 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::vector<
 }
 
 template <typename Stream>
-inline packer<Stream>& operator<< (packer<Stream>& o, const std::vector<char>& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::vector<char>& v)
 {
     o.pack_bin(v.size());
     o.pack_bin_body(&v.front(), v.size());
diff --git a/include/msgpack/adaptor/vector_char_fwd.hpp b/include/msgpack/adaptor/vector_char_fwd.hpp
index 9c596cb1..7dcaf00f 100644
--- a/include/msgpack/adaptor/vector_char_fwd.hpp
+++ b/include/msgpack/adaptor/vector_char_fwd.hpp
@@ -29,7 +29,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 msgpack::object const& operator>> (msgpack::object const& o, std::vector<char>& v);
 
 template <typename Stream>
-packer<Stream>& operator<< (packer<Stream>& o, const std::vector<char>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::vector<char>& v);
 
 void operator<< (msgpack::object& o, const std::vector<char>& v);
 
diff --git a/include/msgpack/adaptor/vector_fwd.hpp b/include/msgpack/adaptor/vector_fwd.hpp
index d1e2c796..2da965cf 100644
--- a/include/msgpack/adaptor/vector_fwd.hpp
+++ b/include/msgpack/adaptor/vector_fwd.hpp
@@ -30,7 +30,7 @@ template <typename T>
 msgpack::object const& operator>> (msgpack::object const& o, std::vector<T>& v);
 
 template <typename Stream, typename T>
-packer<Stream>& operator<< (packer<Stream>& o, const std::vector<T>& v);
+msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::vector<T>& v);
 
 template <typename T>
 void operator<< (msgpack::object::with_zone& o, const std::vector<T>& v);
diff --git a/include/msgpack/object.hpp b/include/msgpack/object.hpp
index 06896834..1385e15c 100644
--- a/include/msgpack/object.hpp
+++ b/include/msgpack/object.hpp
@@ -152,7 +152,7 @@ public:
 namespace detail {
 template <typename Stream, typename T>
 struct packer_serializer {
-    static packer<Stream>& pack(packer<Stream>& o, const T& v) {
+    static msgpack::packer<Stream>& pack(msgpack::packer<Stream>& o, const T& v) {
         // If you get a error 'const class your_class has no member named 'msgpack_pack',
         // check the following:
         // 1. The class your_class should have MSGPACK_DEFINE macro or
@@ -163,7 +163,7 @@ struct packer_serializer {
         //    namespace msgpack {
         //    MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS) {
         //    template <typename Stream>
-        //    inline packer<Stream>& operator<< (packer<Stream>& o, const your_class& v)
+        //    inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const your_class& v)
         //    } // MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
         //    } // namespace msgpack
         //
@@ -176,14 +176,14 @@ struct packer_serializer {
         //    namespace msgpack {
         //    MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS) {
         //    template <typename Stream>
-        //    packer<Stream>& operator<< (packer<Stream>& o, const your_class& v);
+        //    msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const your_class& v);
         //    } // MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
         //    } // namespace msgpack
         //
         //    then, #include "msgpack.hpp", finally place the operator definitions as follows:
         //
         //    template <typename Stream>
-        //    inline packer<Stream>& operator<< (packer<Stream>& o, const your_class& v) {
+        //    inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const your_class& v) {
         //         // packing operation
         //    }
         //    } // MSGPACK_API_VERSION_NAMESPACE(MSGPACK_DEFAULT_API_NS)
@@ -197,7 +197,7 @@ struct packer_serializer {
 
 // serialize operator
 template <typename Stream, typename T>
-inline msgpack::packer<Stream>& operator<< (packer<Stream>& o, const T& v)
+inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const T& v)
 {
     return detail::packer_serializer<Stream, T>::pack(o, v);
 }