Skip to content

Commit

Permalink
fix : includeing windows.h header caause error (#258)
Browse files Browse the repository at this point in the history
  • Loading branch information
rinechran authored and onqtam committed Aug 5, 2019
1 parent 50c6a83 commit 92e8615
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion doctest/doctest.h
Original file line number Diff line number Diff line change
Expand Up @@ -3432,7 +3432,7 @@ Approx& Approx::scale(double newScale) {
bool operator==(double lhs, const Approx& rhs) {
// Thanks to Richard Harris for his help refining this formula
return std::fabs(lhs - rhs.m_value) <
rhs.m_epsilon * (rhs.m_scale + std::max(std::fabs(lhs), std::fabs(rhs.m_value)));
rhs.m_epsilon * (rhs.m_scale + (std::max<double>(std::fabs(lhs), std::fabs(rhs.m_value)));
}
bool operator==(const Approx& lhs, double rhs) { return operator==(rhs, lhs); }
bool operator!=(double lhs, const Approx& rhs) { return !operator==(lhs, rhs); }
Expand Down

4 comments on commit 92e8615

@claremacrae
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@onqtam Did you spot my comment about the mismatched ( in this ticket?

@onqtam
Copy link
Member

@onqtam onqtam commented on 92e8615 Aug 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@claremacrae I missed the conversation - I just saw that the CI tests are passing... very sloppy of me - sorry. I'll revert this in that case and pay more attention when I actually have the time :)

Sorry for the inconvenience.

@onqtam
Copy link
Member

@onqtam onqtam commented on 92e8615 Aug 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just pushed <double> to the dev branch

@claremacrae
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Please sign in to comment.