diff options
| author | frsyuki <frsyuki@5a5092ae-2292-43ba-b2d5-dcab9c1a2731> | 2009-02-15 09:09:57 +0000 |
|---|---|---|
| committer | frsyuki <frsyuki@5a5092ae-2292-43ba-b2d5-dcab9c1a2731> | 2009-02-15 09:09:57 +0000 |
| commit | 48e0274505583affa8546cdffe19761033622aa2 (patch) | |
| tree | 13727db8f6ebfe1d75d05b876f405d3dbfc5496f /cpp | |
| parent | 1278eb3c63e2371283e07c0360b044728d72c704 (diff) | |
| download | msgpack-python-48e0274505583affa8546cdffe19761033622aa2.tar.gz | |
lang/c/msgpack: fixed packaging problem
git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@64 5a5092ae-2292-43ba-b2d5-dcab9c1a2731
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Makefile.am | 3 | ||||
| -rw-r--r-- | cpp/configure.in | 2 | ||||
| -rw-r--r-- | cpp/object.hpp | 6 | ||||
| -rw-r--r-- | cpp/zone.cpp | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am index b9ecb1d..d1fa826 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -14,7 +14,8 @@ nobase_include_HEADERS = \ msgpack/zone.hpp noinst_HEADERS = \ - unpack_context.hpp + unpack_context.hpp \ + msgpack/zone.hpp.erb msgpack/zone.hpp: msgpack/zone.hpp.erb erb $< > $@ diff --git a/cpp/configure.in b/cpp/configure.in index e9e21ea..5126be4 100644 --- a/cpp/configure.in +++ b/cpp/configure.in @@ -1,4 +1,4 @@ -AC_INIT(object.hpp) +AC_INIT(object.cpp) AM_INIT_AUTOMAKE(msgpack, 0.1.0) AC_CONFIG_HEADER(config.h) diff --git a/cpp/object.hpp b/cpp/object.hpp index 9f91677..456210c 100644 --- a/cpp/object.hpp +++ b/cpp/object.hpp @@ -232,7 +232,7 @@ INTEGER_CLASS(int16_t, i16) INTEGER_CLASS(int32_t, i32) INTEGER_CLASS(int64_t, i64) -#undef INTEGER_CLASS(TYPE, NAME) +#undef INTEGER_CLASS #define FLOAT_CLASS(TYPE, NAME) \ @@ -260,7 +260,7 @@ private: \ FLOAT_CLASS(float, float) FLOAT_CLASS(double, double) -#undef FLOAT_CLASS(TYPE, NAME) +#undef FLOAT_CLASS #define RAW_CLASS(NAME, TYPE, EXTRA) \ @@ -281,7 +281,7 @@ private: \ RAW_CLASS(mutable_raw_ref, char*, /*mutable_raw xraw();*/ raw xraw() const; ) RAW_CLASS(raw_ref, const char*, raw xraw() const; ) -#undef RAW_CLASS(NAME, TYPE, EXTRA) +#undef RAW_CLASS struct object_array : object_class, object_container_mixin { diff --git a/cpp/zone.cpp b/cpp/zone.cpp index ff22fc3..4cc50d7 100644 --- a/cpp/zone.cpp +++ b/cpp/zone.cpp @@ -15,7 +15,7 @@ // See the License for the specific language governing permissions and // limitations under the License. // -#include "zone.hpp" +#include "msgpack/zone.hpp" namespace msgpack { |