Skip to content
Snippets Groups Projects
Commit 8e9146b1 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

Merge remote-tracking branch 'origin/release-5.8' into develop

parents eb847909 28aa6e9b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Modules/ThirdParty/MuParserX/src/mpCompat.h.in
+ 3
− 3
View file @ 8e9146b1
......@@ -18,7 +18,7 @@
#ifndef MUP_COMPAT_H
#define MUP_COMPAT_H
/* defined if OTB_CXX_HAS_UNIQUE_PTR cmake check is OK.
/* defined if OTB_CXX_HAS_UNIQUE_PTR cmake check is OK. */
/* See CMake/OTBCheckCpp11Keywords.cmake for more details */
#cmakedefine OTB_CXX_HAS_UNIQUE_PTR
......@@ -26,7 +26,7 @@
#define unique_ptr auto_ptr
#endif
/* defined if OTB_CXX_HAS_OVERRIDE_SPECIFIER cmake check is OK.
/* defined if OTB_CXX_HAS_OVERRIDE_SPECIFIER cmake check is OK. */
/* See CMake/OTBCheckCpp11Keywords.cmake for more details */
#cmakedefine OTB_CXX_HAS_OVERRIDE_SPECIFIER
......@@ -34,7 +34,7 @@
#define unique_ptr auto_ptr
#endif
/* defined if OTB_CXX_HAS_NULLPTR cmake check is OK.
/* defined if OTB_CXX_HAS_NULLPTR cmake check is OK. */
/* See CMake/OTBCheckCpp11Keywords.cmake for more details */
#cmakedefine OTB_CXX_HAS_NULLPTR
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment