From 832b39471512fa9543f981053573fb6b3342a396 Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Fri, 22 Dec 2017 18:25:46 +0000
Subject: Fix Travis build (#4101)

Stop using gdb on osx - was breaking the build
Add clang 3.5 build as travis now defaults to 5.0
Fix unknown-warning-option errors on AppleClang
ProtoProxy: Use nullptr
UrlClientTest: add override to callback destructor
Update jsoncpp to use nullptr
---
 lib/jsoncpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/jsoncpp/include/json/features.h')

diff --git a/lib/jsoncpp b/lib/jsoncpp
index 81cf23791..d5ba7e733 160000
--- a/lib/jsoncpp
+++ b/lib/jsoncpp
@@ -1 +1 @@
-Subproject commit 81cf237917b6873decd27e15b7fe8473003a2762
+Subproject commit d5ba7e7332ca05aa0a9740b497f914be27181774
-- 
cgit v1.2.3