diff --git a/uppsrc/Core/CharSet.cpp b/uppsrc/Core/CharSet.cpp index dcbfce997..8e178ddc2 100644 --- a/uppsrc/Core/CharSet.cpp +++ b/uppsrc/Core/CharSet.cpp @@ -1995,7 +1995,7 @@ void CharSetData::Gen() line[0][c] = c; for(c = 0; c < 128; c++) { int q = table[c]; - if(q >= 128) + if(q >= 128) { if(q < 16 * 128) { int i = q >> 7; if(!line[i]) { @@ -2007,6 +2007,7 @@ void CharSetData::Gen() else if((q & 0xFF00) != 0xEE00) map.Add(q, c + 128); + } } for(c = 0; c < 16; c++) if(!line[c]) diff --git a/uppsrc/Core/JSON.cpp b/uppsrc/Core/JSON.cpp index f35b38896..3e5cc2f0c 100644 --- a/uppsrc/Core/JSON.cpp +++ b/uppsrc/Core/JSON.cpp @@ -192,7 +192,7 @@ template<> void Jsonize(JsonIO& io, int& var) { double v = IntDbl(var); Jsonize(io, v); - if(io.IsLoading()) + if(io.IsLoading()) { if(IsNull(v)) var = Null; else @@ -200,17 +200,19 @@ template<> void Jsonize(JsonIO& io, int& var) var = (int)v; else throw JsonizeError("number is not integer"); + } } template<> void Jsonize(JsonIO& io, int16& var) { double v = var; Jsonize(io, v); - if(io.IsLoading()) + if(io.IsLoading()) { if(v >= -32768 && v <= 32767 && (int)v == v) var = (int16)v; else throw JsonizeError("16-bit integer expected"); + } } template<> void Jsonize(JsonIO& io, bool& var) diff --git a/uppsrc/Core/WString.cpp b/uppsrc/Core/WString.cpp index 008e23990..47b4728e1 100644 --- a/uppsrc/Core/WString.cpp +++ b/uppsrc/Core/WString.cpp @@ -18,7 +18,7 @@ wchar *WString0::Alloc(int& count) void WString0::Free() { - if(alloc > 0) + if(alloc > 0) { if(IsRc()) { Atomic& rc = Rc(); if(AtomicDec(rc) == 0) @@ -26,6 +26,7 @@ void WString0::Free() } else MemoryFree48(ptr); + } } #ifdef _DEBUG diff --git a/uppsrc/Core/XML.cpp b/uppsrc/Core/XML.cpp index 898dd7773..4dfd6f06d 100644 --- a/uppsrc/Core/XML.cpp +++ b/uppsrc/Core/XML.cpp @@ -889,11 +889,12 @@ XmlNode& XmlNode::SetAttr(const char *id, int i) void XmlNode::Shrink() { - if(attr) + if(attr) { if(attr->GetCount() == 0) attr.Clear(); else attr->Shrink(); + } node.Shrink(); }