Skip to content

Instantly share code, notes, and snippets.

@matsuu
Created January 20, 2010 11:38
Show Gist options
  • Save matsuu/281788 to your computer and use it in GitHub Desktop.
Save matsuu/281788 to your computer and use it in GitHub Desktop.
diff -Naur msgpack-0.4.1.orig/cpp/Makefile.am msgpack-0.4.1/cpp/Makefile.am
--- msgpack-0.4.1.orig/cpp/Makefile.am 2010-01-15 04:26:40.000000000 +0900
+++ msgpack-0.4.1/cpp/Makefile.am 2010-01-20 17:40:42.000000000 +0900
@@ -39,6 +39,6 @@
msgpack_test_SOURCES = test.cpp
msgpack_test_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/c -I$(top_srcdir)/cpp
-msgpack_test_LDFLAGS = libmsgpack.la -lgtest_main
+msgpack_test_LDADD = libmsgpack.la -lgtest_main
TESTS = $(check_PROGRAMS)
diff -Naur msgpack-0.4.1.orig/cpp/test.cpp msgpack-0.4.1/cpp/test.cpp
--- msgpack-0.4.1.orig/cpp/test.cpp 2010-01-20 14:24:34.000000000 +0900
+++ msgpack-0.4.1/cpp/test.cpp 2010-01-20 17:28:49.000000000 +0900
@@ -438,7 +438,7 @@
#ifdef HAVE_TR1_UNORDERED_MAP
#include <tr1/unordered_map>
-#include "cpp/type/tr1/unordered_map.hpp"
+#include "cpp/msgpack/type/tr1/unordered_map.hpp"
TEST(MSGPACK_TR1, simple_buffer_unordered_map)
{
for (unsigned int k = 0; k < kLoop; k++) {
@@ -499,7 +499,7 @@
#ifdef HAVE_TR1_UNORDERED_SET
#include <tr1/unordered_set>
-#include "cpp/type/tr1/unordered_set.hpp"
+#include "cpp/msgpack/type/tr1/unordered_set.hpp"
TEST(MSGPACK_TR1, simple_buffer_unordered_set)
{
for (unsigned int k = 0; k < kLoop; k++) {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment