From d1ca52f22f3da9028fbfb27d3d68d6de729bc099 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 22 Aug 2010 06:50:47 +0000 Subject: [PATCH] *XmlRpc: fix of 'double' git-svn-id: svn://ultimatepp.org/upp/trunk@2633 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Vcont.hpp | 2 +- uppsrc/XmlRpc/Xml.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/Core/Vcont.hpp b/uppsrc/Core/Vcont.hpp index a163f0f97..b15739afc 100644 --- a/uppsrc/Core/Vcont.hpp +++ b/uppsrc/Core/Vcont.hpp @@ -263,7 +263,7 @@ void Vector::InsertN(int q, int count) { template void Vector::Insert(int q, const T& x, int count) { if(!count) return; - ASSERT(&x < vector || &x > vector + items); + ASSERT(!(&x >= vector && &x < vector + items)); RawInsert(q, count); DeepCopyConstructFill(vector + q, vector + q + count, x); } diff --git a/uppsrc/XmlRpc/Xml.cpp b/uppsrc/XmlRpc/Xml.cpp index da1a00127..0535e9f97 100644 --- a/uppsrc/XmlRpc/Xml.cpp +++ b/uppsrc/XmlRpc/Xml.cpp @@ -107,7 +107,7 @@ String FormatXmlRpcValue(const Value& v) r = XmlTag("boolean")(AsString((int)(bool)v)); else if(IsNumber(v)) - r = XmlTag("double")(Format("%d", (double)v)); + r = XmlTag("double")(Format("%g", (double)v)); else if(IsDateTime(v)) { Time t = v;