summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrsyuki <frsyuki@5a5092ae-2292-43ba-b2d5-dcab9c1a2731>2009-02-15 09:09:57 +0000
committerfrsyuki <frsyuki@5a5092ae-2292-43ba-b2d5-dcab9c1a2731>2009-02-15 09:09:57 +0000
commit76dda6d36e5a2edbe21443bd7344c41160373e2e (patch)
tree21b9326664c63bed2b5498545ae2a81be8b260e2
parent48e0274505583affa8546cdffe19761033622aa2 (diff)
downloadmsgpack-python-76dda6d36e5a2edbe21443bd7344c41160373e2e.tar.gz
lang/c/msgpack: fixed cpp/Makefile.am
git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@65 5a5092ae-2292-43ba-b2d5-dcab9c1a2731
-rw-r--r--cpp/Makefile.am6
-rw-r--r--cpp/object.cpp6
2 files changed, 9 insertions, 3 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index d1fa826..08ea21f 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -17,6 +17,12 @@ noinst_HEADERS = \
unpack_context.hpp \
msgpack/zone.hpp.erb
+# FIXME
+object.lo: msgpack/zone.hpp
+unpack.lo: msgpack/zone.hpp
+unpack_context.lo: msgpack/zone.hpp
+zone.lo: msgpack/zone.hpp
+
msgpack/zone.hpp: msgpack/zone.hpp.erb
erb $< > $@
diff --git a/cpp/object.cpp b/cpp/object.cpp
index 4068007..7bb9841 100644
--- a/cpp/object.cpp
+++ b/cpp/object.cpp
@@ -258,7 +258,7 @@ INTEGER_OBJECT(i16)
INTEGER_OBJECT(i32)
INTEGER_OBJECT(i64)
-#undef INTEGER_OBJECT(NAME)
+#undef INTEGER_OBJECT
#define FLOAT_OBJECT(NAME) \
@@ -313,7 +313,7 @@ const object_class* object_##NAME::inspect(std::ostream& s) const \
FLOAT_OBJECT(float)
FLOAT_OBJECT(double)
-#undef FLOAT_OBJECT(NAME)
+#undef FLOAT_OBJECT
#define RAW_OBJECT(NAME, EXTRA) \
@@ -345,7 +345,7 @@ RAW_OBJECT(mutable_raw_ref,
RAW_OBJECT(raw_ref,
raw object_raw_ref::xraw() const { return raw(ptr, len); } )
-#undef RAW_OBJECT(NAME, EXTRA)
+#undef RAW_OBJECT
array& object_array::xarray() { return val; }