mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:27:51 +08:00
460b6d5f20
* [manyports] Update version 5 * [coolprop] Update version * Update CONTROL * Update ports/refprop-headers/CONTROL Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
14 lines
421 B
Diff
14 lines
421 B
Diff
diff --git a/src/ODEIntegrators.cpp b/src/ODEIntegrators.cpp
|
|
index 4152f01..e5986ca 100644
|
|
--- a/src/ODEIntegrators.cpp
|
|
+++ b/src/ODEIntegrators.cpp
|
|
@@ -4,6 +4,8 @@
|
|
#include "CPstrings.h"
|
|
#include "Exceptions.h"
|
|
#include <algorithm>
|
|
+#undef max
|
|
+#undef min
|
|
|
|
bool ODEIntegrators::AdaptiveRK54(AbstractODEIntegrator &ode, double tstart, double tend, double hmin, double hmax, double eps_allowed, double step_relax)
|
|
{
|