From 9051e41af54c5bd7415161c9d5e5cc0fd97de5f5 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 4 Mar 2017 19:18:11 -0500 Subject: [PATCH] libshared: Updated to 0dbe6c2818d4dc99f5d0089d6afb1559ed05ebf7 --- src/CMakeLists.txt | 1 - src/commands/CmdConfig.cpp | 4 ++-- src/libshared | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e391fa51..087c006a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,6 @@ set (libshared_SRCS libshared/src/Args.cpp libshared/src/Args.h libshared/src/Duration.cpp libshared/src/Duration.h libshared/src/FS.cpp libshared/src/FS.h libshared/src/JSON.cpp libshared/src/JSON.h - libshared/src/JSON2.cpp libshared/src/JSON2.h libshared/src/Lexer.cpp libshared/src/Lexer.h libshared/src/Msg.cpp libshared/src/Msg.h libshared/src/Palette.cpp libshared/src/Palette.h diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp index c4726e25..9ddaf4a8 100644 --- a/src/commands/CmdConfig.cpp +++ b/src/commands/CmdConfig.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -134,7 +134,7 @@ static bool setConfigVariable (Database& database, const Rules& rules, std::stri lines.push_back (""); // Add new line. - lines.push_back (name + " = " + JSON2::encode (value)); + lines.push_back (name + " = " + json::encode (value)); database.undoTxnStart (); database.undoTxn ("config", "", lines.back ()); diff --git a/src/libshared b/src/libshared index bfb0e90e..0dbe6c28 160000 --- a/src/libshared +++ b/src/libshared @@ -1 +1 @@ -Subproject commit bfb0e90e0c94918b86dd16d8b0e05a74bab8fb75 +Subproject commit 0dbe6c2818d4dc99f5d0089d6afb1559ed05ebf7