Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small error in pull #185 #194

Closed
twelsby opened this issue Jan 24, 2016 · 1 comment
Closed

Small error in pull #185 #194

twelsby opened this issue Jan 24, 2016 · 1 comment
Assignees
Milestone

Comments

@twelsby
Copy link
Contributor

twelsby commented Jan 24, 2016

I was just merging the recent commits and encountered a conflict due to a typo in pull #185 (my bad).

At line 4863 is the following:

else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
{
    return static_cast<number_float_t>(lhs.m_value.number_integer == rhs.m_value.number_float);
}
else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
{
    return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
}

The top return value is incorrect as the parenthesis should surround only lhs.m_value.number_integer

@nlohmann nlohmann added this to the Release 1.0.1 milestone Jan 24, 2016
@nlohmann
Copy link
Owner

Thanks! I'll fix it.

@nlohmann nlohmann self-assigned this Jan 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants