3party/pugixml
0
0
Fork 0
mirror of https://github.com/zeux/pugixml.git synced 2024-12-26 21:04:25 +08:00
Code Issues Projects Releases Wiki Activity

Fix Wdouble-promotion warnings

Browse Source 
We had a few places in test code and library source where we used an
implicit float->double cast; while it should preserve the value exactly,
gcc/clang implement this warning to make sure uses of double are intentional.

This change also adds the warning to Makefile to make sure we don't
regress on this warning.

Fixes #243.
This commit is contained in:
Arseny Kapoulkine 2018-11-23 22:58:18 -08:00
parent aac75cd299
commit f9a2a7d19e
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ EXECUTABLE=$(BUILD)/test
VERSION=$(shell sed -n 's/.*version \(.*\).*/\1/p' src/pugiconfig.hpp) VERSION=$(shell sed -n 's/.*version \(.*\).*/\1/p' src/pugiconfig.hpp)
RELEASE=$(filter-out scripts/archive.py docs/%.adoc,$(shell git ls-files contrib docs scripts src CMakeLists.txt readme.txt)) RELEASE=$(filter-out scripts/archive.py docs/%.adoc,$(shell git ls-files contrib docs scripts src CMakeLists.txt readme.txt))
CXXFLAGS=-g -Wall -Wextra -Werror -pedantic -Wundef -Wshadow -Wcast-align -Wcast-qual -Wold-style-cast CXXFLAGS=-g -Wall -Wextra -Werror -pedantic -Wundef -Wshadow -Wcast-align -Wcast-qual -Wold-style-cast -Wdouble-promotion
LDFLAGS= LDFLAGS=
ifeq ($(config),release) ifeq ($(config),release)

4
src/pugixml.cpp
View File

@ -4656,7 +4656,7 @@ PUGI__NS_BEGIN
PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value) PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value)
{ {
char buf[128]; char buf[128];
PUGI__SNPRINTF(buf, "%.9g", value); PUGI__SNPRINTF(buf, "%.9g", double(value));
return set_value_ascii(dest, header, header_mask, buf); return set_value_ascii(dest, header, header_mask, buf);
} }
@ -8070,7 +8070,7 @@ PUGI__NS_BEGIN
typedef uint32_t UI; // BCC5 workaround typedef uint32_t UI; // BCC5 workaround
union { float f; UI i; } u; union { float f; UI i; } u;
u.i = 0x7fc00000; u.i = 0x7fc00000;
return u.f; return double(u.f);
#else #else
// fallback // fallback
const volatile double zero = 0.0; const volatile double zero = 0.0;

2
tests/test.cpp
View File

@ -117,7 +117,7 @@ bool test_xpath_number(const pugi::xpath_node& node, const pugi::char_t* query,
double value = q.evaluate_number(node); double value = q.evaluate_number(node);
double absolute_error = fabs(value - expected); double absolute_error = fabs(value - expected);
const double tolerance = 1e-15f; const double tolerance = 1e-15;
return absolute_error < tolerance || absolute_error < fabs(expected) * tolerance; return absolute_error < tolerance || absolute_error < fabs(expected) * tolerance;
} }

12
tests/test_dom_text.cpp
View File

@ -124,12 +124,12 @@ TEST_XML(dom_text_as_float, "<node><text1>0</text1><text2>1</text2><text3>0.12</
xml_node node = doc.child(STR("node")); xml_node node = doc.child(STR("node"));
CHECK(xml_text().as_float() == 0); CHECK(xml_text().as_float() == 0);
CHECK_DOUBLE(node.child(STR("text1")).text().as_float(), 0); CHECK_DOUBLE(double(node.child(STR("text1")).text().as_float()), 0);
CHECK_DOUBLE(node.child(STR("text2")).text().as_float(), 1); CHECK_DOUBLE(double(node.child(STR("text2")).text().as_float()), 1);
CHECK_DOUBLE(node.child(STR("text3")).text().as_float(), 0.12); CHECK_DOUBLE(double(node.child(STR("text3")).text().as_float()), 0.12);
CHECK_DOUBLE(node.child(STR("text4")).text().as_float(), -5.1); CHECK_DOUBLE(double(node.child(STR("text4")).text().as_float()), -5.1);
CHECK_DOUBLE(node.child(STR("text5")).text().as_float(), 3e-4); CHECK_DOUBLE(double(node.child(STR("text5")).text().as_float()), 3e-4);
CHECK_DOUBLE(node.child(STR("text6")).text().as_float(), 3.14159265358979323846); CHECK_DOUBLE(double(node.child(STR("text6")).text().as_float()), 3.14159265358979323846);
} }
TEST_XML(dom_text_as_double, "<node><text1>0</text1><text2>1</text2><text3>0.12</text3><text4>-5.1</text4><text5>3e-4</text5><text6>3.14159265358979323846</text6></node>") TEST_XML(dom_text_as_double, "<node><text1>0</text1><text2>1</text2><text3>0.12</text3><text4>-5.1</text4><text5>3e-4</text5><text6>3.14159265358979323846</text6></node>")

12
tests/test_dom_traverse.cpp
View File

@ -150,12 +150,12 @@ TEST_XML(dom_attr_as_float, "<node attr1='0' attr2='1' attr3='0.12' attr4='-5.1'
xml_node node = doc.child(STR("node")); xml_node node = doc.child(STR("node"));
CHECK(xml_attribute().as_float() == 0); CHECK(xml_attribute().as_float() == 0);
CHECK_DOUBLE(node.attribute(STR("attr1")).as_float(), 0); CHECK_DOUBLE(double(node.attribute(STR("attr1")).as_float()), 0);
CHECK_DOUBLE(node.attribute(STR("attr2")).as_float(), 1); CHECK_DOUBLE(double(node.attribute(STR("attr2")).as_float()), 1);
CHECK_DOUBLE(node.attribute(STR("attr3")).as_float(), 0.12); CHECK_DOUBLE(double(node.attribute(STR("attr3")).as_float()), 0.12);
CHECK_DOUBLE(node.attribute(STR("attr4")).as_float(), -5.1); CHECK_DOUBLE(double(node.attribute(STR("attr4")).as_float()), -5.1);
CHECK_DOUBLE(node.attribute(STR("attr5")).as_float(), 3e-4); CHECK_DOUBLE(double(node.attribute(STR("attr5")).as_float()), 3e-4);
CHECK_DOUBLE(node.attribute(STR("attr6")).as_float(), 3.14159265358979323846); CHECK_DOUBLE(double(node.attribute(STR("attr6")).as_float()), 3.14159265358979323846);
} }
TEST_XML(dom_attr_as_double, "<node attr1='0' attr2='1' attr3='0.12' attr4='-5.1' attr5='3e-4' attr6='3.14159265358979323846'/>") TEST_XML(dom_attr_as_double, "<node attr1='0' attr2='1' attr3='0.12' attr4='-5.1' attr5='3e-4' attr6='3.14159265358979323846'/>")

4
tests/test_xpath.cpp
View File

@ -205,8 +205,8 @@ TEST(xpath_long_numbers_parse)
xml_node c; xml_node c;
// check parsing // check parsing
CHECK_XPATH_NUMBER(c, str_flt_max, std::numeric_limits<float>::max()); CHECK_XPATH_NUMBER(c, str_flt_max, double(std::numeric_limits<float>::max()));
CHECK_XPATH_NUMBER(c, str_flt_max_dec, std::numeric_limits<float>::max()); CHECK_XPATH_NUMBER(c, str_flt_max_dec, double(std::numeric_limits<float>::max()));
CHECK_XPATH_NUMBER(c, str_dbl_max, std::numeric_limits<double>::max()); CHECK_XPATH_NUMBER(c, str_dbl_max, std::numeric_limits<double>::max());
CHECK_XPATH_NUMBER(c, str_dbl_max_dec, std::numeric_limits<double>::max()); CHECK_XPATH_NUMBER(c, str_dbl_max_dec, std::numeric_limits<double>::max());
} }