diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:04:05 -0700 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:27:52 -0700 |
| commit | 4a893f72cadaa875a920db8949171b002f656e43 (patch) | |
| tree | 1e08a3cb6f579cab9c3c9a138d36ababdf76121b /includes/SimpleMustache.h | |
| parent | 56d91ddd2cd42b782cde0bb3fdf4eb9ebe7597be (diff) | |
| parent | 06674e57649d536cf19715524ee40c5ad4a9026d (diff) | |
Merge commit '06674e57649d536cf19715524ee40c5ad4a9026d'
Conflicts:
includes/LuaTask.h
includes/TaskMan.h
includes/Threads.h
src/TaskMan.cc
src/Threads.cc
Diffstat (limited to 'includes/SimpleMustache.h')
| -rw-r--r-- | includes/SimpleMustache.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/SimpleMustache.h b/includes/SimpleMustache.h index 52a2603..28cb477 100644 --- a/includes/SimpleMustache.h +++ b/includes/SimpleMustache.h @@ -22,7 +22,7 @@ class SimpleMustache { friend class Context; }; - Context() : m_type(CONTEXTLIST), m_root(true) { } + Context() { } ~Context() { empty(); } Proxy operator[](ssize_t idx) { ensureList(); return Proxy(this, idx); } Context & operator[](const char * str); @@ -55,7 +55,7 @@ class SimpleMustache { BOOLSEC, CONTEXTLIST, LAMBDA, - } m_type; + } m_type = CONTEXTLIST; Context(ContextType type) : m_type(type), m_root(false) { } Context(Context & c) { Failure("You can't copy a Context; use references"); } Context & operator=(Context & c) { Failure("You can't assign a Context; use references"); return *this; } @@ -64,7 +64,7 @@ class SimpleMustache { typedef std::map<String, Context *> SubContext; typedef std::vector<SubContext> ContextList; ContextList m_contextList; - bool m_root; + bool m_root = true; void empty(bool skipFirst = false); void ensureList(bool single = false); |