diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-11-02 17:01:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2017-11-02 17:01:36 +0000 |
| commit | 2d89ec62b5118a4a5b5834b636184271c53b2312 (patch) | |
| tree | 859fd0732782dea2376a78ffb1f7442e30f85f1c /src/libwindowmanager.h | |
| parent | 52b760024986f635b78d77573311072936d16e4e (diff) | |
| parent | b6f0140e194b80fa01b39f20dbff3d436dc2e792 (diff) | |
Merge changes from topics '11553', '(detached'eel_4.99.2eel/4.99.24.99.2
* changes:
Use a version for the library
Replace json_object_object_get() with json_object_object_get_ex()
Replace 'constexpr' with 'const char*'
Diffstat (limited to 'src/libwindowmanager.h')
| -rw-r--r-- | src/libwindowmanager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libwindowmanager.h b/src/libwindowmanager.h index 59c5ca5..83dff5f 100644 --- a/src/libwindowmanager.h +++ b/src/libwindowmanager.h @@ -38,8 +38,8 @@ public: const std::string kStrAreaSub = "sub"; /* Key for json obejct */ - constexpr static char *kKeyDrawingName = "drawing_name"; - constexpr static char *kKeyDrawingArea = "drawing_area"; + const char *kKeyDrawingName = "drawing_name"; + const char *kKeyDrawingArea = "drawing_area"; enum EventType { Event_Active = 0, |