Squashed 'src/univalue/' changes from 51d3ab34ba..7890db99d6

7890db99d6 Merge #11: Remove deprecated std pair wrappers
40e34852ac Merge #14: Cleaned up namespace imports to reduce symbol collisions
85052a4819 Remove deprecated std::pair wrappers
d208f986dd Cleaned up namespace imports to reduce symbol collisions

git-subtree-dir: src/univalue
git-subtree-split: 7890db99d693572d27ade3e14268bd7236134529
This commit is contained in:
MarcoFalke
2018-09-07 08:20:26 -04:00
parent a570098021
commit dc287c98f8
6 changed files with 27 additions and 104 deletions

View File

@@ -12,8 +12,6 @@
#include <string.h>
#include "univalue.h"
using namespace std;
static bool initEscapes;
static std::string escapes[256];