Commitf1e3407

authored

Fix 'const' qualifier on bool& has no effect (nlohmann#3678)

* Fix 'const' qualifier on bool& has no effectThanks,@georgthegreat, for pointing out this issue.* Extend std::vector<bool> unit test

1 parentbfbe774 commitf1e3407Copy full SHA for f1e3407

File tree

+28

-7

lines changed

+28

-7

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -267,9 +267,15 @@ inline void to_json(BasicJsonType& j, T b) noexcept`
`267`	`267`	`external_constructor<value_t::boolean>::construct(j, b);`
`268`	`268`	`}`
`269`	`269`
`270`		`-template<typename BasicJsonType,`
`271`		`-enable_if_t<std::is_convertible<const std::vector<bool>::reference&,typename BasicJsonType::boolean_t>::value,int> =0>`
`272`		`-inlinevoidto_json(BasicJsonType& j,const std::vector<bool>::reference& b)noexcept`
	`270`	`+template<typename BasicJsonType,typename BoolRef,`
	`271`	`+enable_if_t <`
	`272`	`+ ((std::is_same<std::vector<bool>::reference, BoolRef>::value`
	`273`	`+ && !std::is_same <std::vector<bool>::reference,typename BasicJsonType::boolean_t&>::value)`
	`274`	`+ \|\| (std::is_same<std::vector<bool>::const_reference, BoolRef>::value`
	`275`	`+ && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,`
	`276`	`+typename BasicJsonType::boolean_t >::value))`
	`277`	`+ && std::is_convertible<const BoolRef&,typename BasicJsonType::boolean_t>::value,int > =0 >`
	`278`	`+inlinevoidto_json(BasicJsonType& j,const BoolRef& b)noexcept`
`273`	`279`	`{`
`274`	`280`	`external_constructor<value_t::boolean>::construct(j,static_cast<typename BasicJsonType::boolean_t>(b));`
`275`	`281`	`}`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5500,9 +5500,15 @@ inline void to_json(BasicJsonType& j, T b) noexcept`
`5500`	`5500`	`external_constructor<value_t::boolean>::construct(j, b);`
`5501`	`5501`	`}`
`5502`	`5502`
`5503`		`-template<typename BasicJsonType,`
`5504`		`- enable_if_t<std::is_convertible<const std::vector<bool>::reference&, typename BasicJsonType::boolean_t>::value, int> = 0>`
`5505`		`-inline void to_json(BasicJsonType& j, const std::vector<bool>::reference& b) noexcept`
	`5503`	`+template < typename BasicJsonType, typename BoolRef,`
	`5504`	`+ enable_if_t <`
	`5505`	`+ ((std::is_same<std::vector<bool>::reference, BoolRef>::value`
	`5506`	`+ && !std::is_same <std::vector<bool>::reference, typename BasicJsonType::boolean_t&>::value)`
	`5507`	`+ \|\| (std::is_same<std::vector<bool>::const_reference, BoolRef>::value`
	`5508`	`+ && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,`
	`5509`	`+ typename BasicJsonType::boolean_t >::value))`
	`5510`	`+ && std::is_convertible<const BoolRef&, typename BasicJsonType::boolean_t>::value, int > = 0 >`
	`5511`	`+inline void to_json(BasicJsonType& j, const BoolRef& b) noexcept`
`5506`	`5512`	`{`
`5507`	`5513`	`external_constructor<value_t::boolean>::construct(j, static_cast<typename BasicJsonType::boolean_t>(b));`
`5508`	`5514`	`}`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -454,10 +454,19 @@ TEST_CASE("constructors")`
`454`	`454`	`CHECK(j.type() == json::value_t::boolean);`
`455`	`455`	`}`
`456`	`456`
`457`		`-SECTION("from std::vector<bool>::refrence")`
	`457`	`+SECTION("from std::vector<bool>::reference")`
`458`	`458`	`{`
`459`	`459`	`std::vector<bool> v{true};`
`460`	`460`	`jsonj(v[0]);`
	`461`	`+CHECK(std::is_same<decltype(v[0]), std::vector<bool>::reference>::value);`
	`462`	`+CHECK(j.type() == json::value_t::boolean);`
	`463`	`+ }`
	`464`	`+`
	`465`	`+SECTION("from std::vector<bool>::const_reference")`
	`466`	`+ {`
	`467`	`+const std::vector<bool> v{true};`
	`468`	`+ jsonj(v[0]);`
	`469`	`+CHECK(std::is_same<decltype(v[0]), std::vector<bool>::const_reference>::value);`
`461`	`470`	`CHECK(j.type() == json::value_t::boolean);`
`462`	`471`	`}`
`463`	`472`	`}`

Comments

(0)