From c34ed46eb7bbe513266c302b76ec4e4902428728 Mon Sep 17 00:00:00 2001 From: cxl Date: Sat, 9 Feb 2013 09:59:21 +0000 Subject: [PATCH] Skylark: Http now overwrites variables than adding them (Add -> GetAdd) git-svn-id: svn://ultimatepp.org/upp/trunk@5773 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Skylark/Http.h | 6 +++--- uppsrc/Skylark/Renderer.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/uppsrc/Skylark/Http.h b/uppsrc/Skylark/Http.h index 808b2ef29..303e067e3 100644 --- a/uppsrc/Skylark/Http.h +++ b/uppsrc/Skylark/Http.h @@ -21,9 +21,9 @@ protected: friend String GetIdentity(const Renderer *r); public: - Renderer& operator()(const char *id, const char *v) { var.Add(id, v); return *this; } - Renderer& operator()(const char *id, const String& v) { var.Add(id, v); return *this; } - Renderer& operator()(const char *id, const Value& v) { var.Add(id, v); return *this; } + Renderer& operator()(const char *id, const char *v) { var.GetAdd(id) = v; return *this; } + Renderer& operator()(const char *id, const String& v) { var.GetAdd(id) = v; return *this; } + Renderer& operator()(const char *id, const Value& v) { var.GetAdd(id) = v; return *this; } Renderer& operator()(const ValueMap& map); Renderer& operator()(const char *id, const HandlerId& handler); Renderer& operator()(const char *id, const HandlerId& handler, const Value& arg1); diff --git a/uppsrc/Skylark/Renderer.cpp b/uppsrc/Skylark/Renderer.cpp index 77c686c5b..39df54cbd 100644 --- a/uppsrc/Skylark/Renderer.cpp +++ b/uppsrc/Skylark/Renderer.cpp @@ -10,13 +10,13 @@ Renderer& Renderer::operator()(const ValueMap& map) ValueArray v = map.GetValues(); const Index& k = map.GetKeys(); for(int i = 0; i < map.GetCount(); i++) - var.Add(k[i], v[i]); + var.GetAdd(k[i]) = v[i]; return *this; } Renderer& Renderer::Link(const char *id, const HandlerId& handler, const Vector& arg) { - var.Add(id, Raw('\"' + MakeLink(handler, arg) + '\"')); + var.GetAdd(id) = Raw('\"' + MakeLink(handler, arg) + '\"'); return *this; }