summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/object.hpp10
-rw-r--r--cpp/pack.hpp7
2 files changed, 7 insertions, 10 deletions
diff --git a/cpp/object.hpp b/cpp/object.hpp
index 860b569..09ddb89 100644
--- a/cpp/object.hpp
+++ b/cpp/object.hpp
@@ -111,9 +111,6 @@ std::ostream& operator<< (std::ostream& s, const object o);
template <typename Stream, typename T>
-inline void pack(Stream& s, const T& v);
-
-template <typename Stream, typename T>
packer<Stream>& operator<< (packer<Stream>& o, const T& v);
template <typename T>
@@ -240,13 +237,6 @@ inline void pack(packer<Stream>& o, const T& v)
// obsolete
template <typename Stream, typename T>
-inline void pack(Stream& s, const T& v)
-{
- packer<Stream>(s).pack(v);
-}
-
-// obsolete
-template <typename Stream, typename T>
inline void pack_copy(packer<Stream>& o, T v)
{
pack(o, v);
diff --git a/cpp/pack.hpp b/cpp/pack.hpp
index 257ccb6..c8e37eb 100644
--- a/cpp/pack.hpp
+++ b/cpp/pack.hpp
@@ -112,6 +112,13 @@ private:
};
+template <typename Stream, typename T>
+inline void pack(Stream& s, const T& v)
+{
+ packer<Stream>(s).pack(v);
+}
+
+
#define msgpack_pack_inline_func(name) \
template <typename Stream> \
inline void packer<Stream>::_pack ## name