Add msgpack prefix to type_errors

Author: nobu-k

include/msgpack/adaptor/bool.hpp

@@ -28,7 +28,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 
 inline msgpack::object const& operator>> (msgpack::object const& o, bool& v)
 {
-    if(o.type != msgpack::type::BOOLEAN) { throw type_error(); }
+    if(o.type != msgpack::type::BOOLEAN) { throw msgpack::type_error(); }
     v = o.via.boolean;
     return o;
 }

include/msgpack/adaptor/cpp11/array.hpp

@@ -31,8 +31,8 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 
 template <typename T, std::size_t N>
 inline msgpack::object const& operator>> (msgpack::object const& o, std::array<T, N>& v) {
-    if(o.type != msgpack::type::ARRAY) { throw type_error(); }
-    if(o.via.array.size != N) { throw type_error(); }
+    if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
+    if(o.via.array.size != N) { throw msgpack::type_error(); }
     if(o.via.array.size > 0) {
         msgpack::object* p = o.via.array.ptr;
         msgpack::object* const pend = o.via.array.ptr + o.via.array.size;

include/msgpack/adaptor/cpp11/array_char.hpp

@@ -33,15 +33,15 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::array<c
 {
     switch (o.type) {
     case msgpack::type::BIN:
-        if(o.via.bin.size != N) { throw type_error(); }
+        if(o.via.bin.size != N) { throw msgpack::type_error(); }
         std::memcpy(v.data(), o.via.bin.ptr, o.via.bin.size);
         break;
     case msgpack::type::STR:
-        if(o.via.str.size != N) { throw type_error(); }
+        if(o.via.str.size != N) { throw msgpack::type_error(); }
         std::memcpy(v.data(), o.via.str.ptr, N);
         break;
     default:
-        throw type_error();
+        throw msgpack::type_error();
         break;
     }
     return o;

include/msgpack/adaptor/cpp11/forward_list.hpp

@@ -32,7 +32,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 template <typename T>
 inline msgpack::object const& operator>> (msgpack::object const& o, std::forward_list<T>& v)
 {
-    if(o.type != msgpack::type::ARRAY) { throw type_error(); }
+    if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
     v.resize(o.via.array.size);
     msgpack::object* p = o.via.array.ptr;
     for (auto &e : v) {

include/msgpack/adaptor/cpp11/tuple.hpp

@@ -100,8 +100,8 @@ template <typename... Args>
 inline msgpack::object const& operator>> (
     msgpack::object const& o,
     std::tuple<Args...>& v) {
-    if(o.type != msgpack::type::ARRAY) { throw type_error(); }
-    if(o.via.array.size < sizeof...(Args)) { throw type_error(); }
+    if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
+    if(o.via.array.size < sizeof...(Args)) { throw msgpack::type_error(); }
     StdTupleConverter<decltype(v), sizeof...(Args)>::convert(o, v);
     return o;
 }

include/msgpack/adaptor/cpp11/unordered_map.hpp

@@ -31,7 +31,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 template <typename K, typename V>
 inline msgpack::object const& operator>> (msgpack::object const& o, std::unordered_map<K, V>& v)
 {
-    if(o.type != msgpack::type::MAP) { throw type_error(); }
+    if(o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
     msgpack::object_kv* p(o.via.map.ptr);
     msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size);
     std::unordered_map<K, V> tmp;
@@ -84,7 +84,7 @@ inline void operator<< (msgpack::object::with_zone& o, const std::unordered_map<
 template <typename K, typename V>
 inline msgpack::object const& operator>> (msgpack::object const& o, std::unordered_multimap<K, V>& v)
 {
-    if(o.type != msgpack::type::MAP) { throw type_error(); }
+    if(o.type != msgpack::type::MAP) { throw msgpack::type_error(); }
     msgpack::object_kv* p(o.via.map.ptr);
     msgpack::object_kv* const pend(o.via.map.ptr + o.via.map.size);
     std::unordered_multimap<K, V> tmp;

include/msgpack/adaptor/cpp11/unordered_set.hpp

@@ -31,7 +31,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 template <typename T>
 inline msgpack::object const& operator>> (msgpack::object const& o, std::unordered_set<T>& v)
 {
-    if(o.type != msgpack::type::ARRAY) { throw type_error(); }
+    if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
     msgpack::object* p = o.via.array.ptr + o.via.array.size;
     msgpack::object* const pbegin = o.via.array.ptr;
     std::unordered_set<T> tmp;
@@ -81,7 +81,7 @@ inline void operator<< (msgpack::object::with_zone& o, const std::unordered_set<
 template <typename T>
 inline msgpack::object const& operator>> (msgpack::object const& o, std::unordered_multiset<T>& v)
 {
-    if(o.type != msgpack::type::ARRAY) { throw type_error(); }
+    if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
     msgpack::object* p = o.via.array.ptr + o.via.array.size;
     msgpack::object* const pbegin = o.via.array.ptr;
     std::unordered_multiset<T> tmp;

include/msgpack/adaptor/deque.hpp

@@ -31,7 +31,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
 template <typename T>
 inline msgpack::object const& operator>> (msgpack::object const& o, std::deque<T>& v)
 {
-    if(o.type != msgpack::type::ARRAY) { throw type_error(); }
+    if(o.type != msgpack::type::ARRAY) { throw msgpack::type_error(); }
     v.resize(o.via.array.size);
     msgpack::object* p = o.via.array.ptr;
     msgpack::object* const pend = o.via.array.ptr + o.via.array.size;