Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
opSimulation
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Saifeddine MAHMOUDI
opSimulation
Commits
774f5dea
Commit
774f5dea
authored
2 years ago
by
Uwe Woessner
Browse files
Options
Downloads
Patches
Plain Diff
introduce NOMINMAX to prevent issues with min() and max() in MSVC
parent
dea20d66
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/global.cmake
+1
-0
1 addition, 0 deletions
cmake/global.cmake
sim/src/components/Algorithm_FmuWrapper/src/OsmpFmuHandler.cpp
+1
-1
1 addition, 1 deletion
...rc/components/Algorithm_FmuWrapper/src/OsmpFmuHandler.cpp
with
2 additions
and
1 deletion
cmake/global.cmake
+
1
−
0
View file @
774f5dea
...
...
@@ -115,6 +115,7 @@ endif()
if
(
WIN32
)
set
(
CMAKE_INSTALL_PREFIX
"C:/OpenPASS"
CACHE PATH
"Destination directory"
)
add_compile_definitions
(
WIN32
)
add_compile_definitions
(
NOMINMAX
)
#we use c++ min and max from <limits> this prevents windows.h from defining min and max
add_compile_definitions
(
BOOST_ALL_NO_LIB
)
add_compile_definitions
(
BOOST_ALL_DYN_LINK
)
add_compile_definitions
(
_USE_MATH_DEFINES
)
...
...
This diff is collapsed.
Click to expand it.
sim/src/components/Algorithm_FmuWrapper/src/OsmpFmuHandler.cpp
+
1
−
1
View file @
774f5dea
...
...
@@ -1036,7 +1036,7 @@ osi3::SensorViewConfiguration OsmpFmuHandler::GenerateDefaultSensorViewConfigura
viewConfiguration
.
mutable_mounting_position
()
->
mutable_position
()
->
set_z
(
0.0
);
viewConfiguration
.
set_field_of_view_horizontal
(
M_2_PI
);
viewConfiguration
.
set_range
(
(
std
::
numeric_limits
<
double
>::
max
)
());
viewConfiguration
.
set_range
(
std
::
numeric_limits
<
double
>::
max
());
return
viewConfiguration
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment