summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2020-02-20 00:26:36 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2020-02-20 00:26:36 +0000
commite39bfc895de4193d545fb41b4619215681882df9 (patch)
tree3e979b346a0f1811e20f4ca5ae36359cc9d8f2c7
parentRefactor to support extensible lexer (diff)
downloadlibjsonpp-e39bfc895de4193d545fb41b4619215681882df9.tar.bz2
libjsonpp-e39bfc895de4193d545fb41b4619215681882df9.tar.xz
libjsonpp-e39bfc895de4193d545fb41b4619215681882df9.zip
Modernize and tidy
-rw-r--r--libjsonpp/jsonpp.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libjsonpp/jsonpp.h b/libjsonpp/jsonpp.h
index ac45acd..8ad953d 100644
--- a/libjsonpp/jsonpp.h
+++ b/libjsonpp/jsonpp.h
@@ -11,20 +11,20 @@ namespace json {
extern const std::string utf8;
extern const std::string null;
- typedef Glib::ustring String;
- typedef double Number;
- typedef bool Boolean;
+ using String = Glib::ustring;
+ using Number = double;
+ using Boolean = bool;
#pragma GCC visibility push(default)
class Null { };
class Object;
class Array;
- typedef std::variant<Null, String, Number, Object, Array, Boolean> Value;
- typedef std::map<std::string, Value, std::less<>> M;
+ using Value = std::variant<Null, String, Number, Object, Array, Boolean>;
+ using M = std::map<std::string, Value, std::less<>>;
class Object : public M {
public:
using M::M;
};
- typedef std::vector<Value> A;
+ using A = std::vector<Value>;
class Array : public A {
public:
using A::A;