cpp: version 0.5.2

cpp/ChangeLog

@@ -1,4 +1,9 @@
 
+2010-07-14 version 0.5.2:
+
+  * type::raw::str(), operator==, operator!=, operator< and operator> are now const
+  * generates version.h using AC_OUTPUT macro in ./configure
+
 2010-07-06 version 0.5.1:
 
   * Add msgpack_vrefbuffer_new and msgpack_vrefbuffer_free

cpp/configure.in

@@ -1,6 +1,6 @@
 AC_INIT(src/object.cpp)
 AC_CONFIG_AUX_DIR(ac)
-AM_INIT_AUTOMAKE(msgpack, 0.5.1)
+AM_INIT_AUTOMAKE(msgpack, 0.5.2)
 AC_CONFIG_HEADER(config.h)
 
 AC_SUBST(CFLAGS)
@@ -68,5 +68,8 @@ AC_SUBST(VERSION_MAJOR, $major)
 AC_SUBST(VERSION_MINOR, $minor)
 
 
-AC_OUTPUT([Makefile src/Makefile test/Makefile])
+AC_OUTPUT([Makefile
+		   src/Makefile
+		   src/msgpack/version.h
+		   test/Makefile])
 

cpp/src/Makefile.am

@@ -82,13 +82,6 @@ EXTRA_DIST = \
 		msgpack/type/tuple.hpp.erb
 
 
-msgpack/version.h: msgpack/version.h.in Makefile.in
-	sed -e s/VERSION_UNDEFINED/$(VERSION)/ \
-		-e s/VERSION_MAJOR_UNDEFINED/$(VERSION_MAJOR)/ \
-		-e s/VERSION_MINOR_UNDEFINED/$(VERSION_MINOR)/ \
-		$< > $@
-
-
 doxygen_c:
 	cat ../Doxyfile > Doxyfile_c
 	echo "FILE_PATTERNS      = *.h" >> Doxyfile_c

cpp/src/msgpack/type/raw.hpp

@@ -33,25 +33,25 @@ struct raw_ref {
 	uint32_t size;
 	const char* ptr;
 
-	std::string str() { return std::string(ptr, size); }
+	std::string str() const { return std::string(ptr, size); }
 
-	bool operator== (const raw_ref& x)
+	bool operator== (const raw_ref& x) const
 	{
 		return size == x.size && memcmp(ptr, x.ptr, size) == 0;
 	}
 
-	bool operator!= (const raw_ref& x)
+	bool operator!= (const raw_ref& x) const
 	{
 		return !(*this != x);
 	}
 
-	bool operator< (const raw_ref& x)
+	bool operator< (const raw_ref& x) const
 	{
 		if(size == x.size) { return memcmp(ptr, x.ptr, size) < 0; }
 		else { return size < x.size; }
 	}
 
-	bool operator> (const raw_ref& x)
+	bool operator> (const raw_ref& x) const
 	{
 		if(size == x.size) { return memcmp(ptr, x.ptr, size) > 0; }
 		else { return size > x.size; }

cpp/src/msgpack/version.h.in

@@ -27,9 +27,9 @@ const char* msgpack_version(void);
 int msgpack_version_major(void);
 int msgpack_version_minor(void);
 
-#define MSGPACK_VERSION "VERSION_UNDEFINED"
-#define MSGPACK_VERSION_MAJOR VERSION_MAJOR_UNDEFINED
-#define MSGPACK_VERSION_MINOR VERSION_MINOR_UNDEFINED
+#define MSGPACK_VERSION "@VERSION@"
+#define MSGPACK_VERSION_MAJOR @VERSION_MAJOR@
+#define MSGPACK_VERSION_MINOR @VERSION_MINOR@
 
 
 #ifdef __cplusplus