[Pkg-bitcoin-commits] [libunivalue] 33/38: Merge PR #32 from branch 'nul-not-special' of git://github.com/ryanofsky/univalue into merge

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libunivalue.

commit 36405413e85718692c46ea23f66980b9698cc148
Merge: 89bb073 fd32d1a
Author: Jeff Garzik <jeff at bloq.com>
Date:   Sun Jan 29 14:46:05 2017 -0500

    Merge PR #32 from branch 'nul-not-special' of git://github.com/ryanofsky/univalue into merge
    
    Conflicts:
    	Makefile.am
    	lib/univalue_read.cpp
    	test/.gitignore

 Makefile.am           |   8 +++++++-
 include/univalue.h    |   5 +++--
 lib/univalue.cpp      |   2 +-
 lib/univalue_read.cpp |  46 +++++++++++++++++++++++++++-------------------
 test/.gitignore       |   1 +
 test/fail42.json      | Bin 0 -> 37 bytes
 test/no_nul.cpp       |   8 ++++++++
 test/unitester.cpp    |   1 +
 8 files changed, 48 insertions(+), 23 deletions(-)

diff --cc Makefile.am
index 61a24a9,ee3b33e..532fa19
--- a/Makefile.am
+++ b/Makefile.am
@@@ -42,11 -42,11 +42,16 @@@ test_unitester_LDADD = libunivalue.l
  test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
  test_unitester_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
  
 +test_test_json_SOURCES = test/test_json.cpp
 +test_test_json_LDADD = libunivalue.la
 +test_test_json_CXXFLAGS = -I$(top_srcdir)/include
 +test_test_json_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
 +
+ test_no_nul_SOURCES = test/no_nul.cpp
+ test_no_nul_LDADD = libunivalue.la
+ test_no_nul_CXXFLAGS = -I$(top_srcdir)/include
+ test_no_nul_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
+ 
  TEST_FILES = \
  	$(TEST_DATA_DIR)/fail10.json \
  	$(TEST_DATA_DIR)/fail11.json \
diff --cc test/.gitignore
index 599875d,aea1237..9d0ed57
--- a/test/.gitignore
+++ b/test/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
  unitester
 +test_json
+ no_nul
  
  *.trs
  *.log

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libunivalue.git