From 3f166c25c81ec1bf3eb3b86d482e2a9388dc6fb2 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 21 Nov 2012 20:04:18 +0000 Subject: [PATCH] Core: MapConvert::Default git-svn-id: svn://ultimatepp.org/upp/trunk@5574 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Convert.cpp | 2 +- uppsrc/Core/Convert.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/uppsrc/Core/Convert.cpp b/uppsrc/Core/Convert.cpp index c7a377d66..e2a7b35b2 100644 --- a/uppsrc/Core/Convert.cpp +++ b/uppsrc/Core/Convert.cpp @@ -493,7 +493,7 @@ GLOBAL_VAR_INIT(const ConvertString, StdConvertString); GLOBAL_VARP_INIT(const ConvertString, StdConvertStringNotNull, (INT_MAX, true)) Value MapConvert::Format(const Value& q) const { - return map.Get(q, Null); + return map.Get(q, default_value); } NoConvertClass::NoConvertClass() {} diff --git a/uppsrc/Core/Convert.h b/uppsrc/Core/Convert.h index 9c947d137..1f89b3a78 100644 --- a/uppsrc/Core/Convert.h +++ b/uppsrc/Core/Convert.h @@ -233,10 +233,12 @@ public: protected: VectorMap map; + Value default_value; public: void Clear() { map.Clear(); } MapConvert& Add(const Value& a, const Value& b) { map.Add(a, b); return *this; } + MapConvert& Default(const Value& v) { default_value = v; return *this; } int GetCount() const { return map.GetCount(); } int Find(const Value& v) const { return map.Find(v); }