Merge branch 'beltoforion:master' into master

Author: lformaggia

CMakeLists.txt

@@ -23,7 +23,7 @@ option(ENABLE_WIDE_CHAR "Enable wide character support" OFF)
 option(BUILD_SHARED_LIBS "Build shared/static libs" ON)
 
 if(ENABLE_OPENMP)
-    find_package(OpenMP REQUIRED)
+    find_package(OpenMP REQUIRED COMPONENTS CXX)
 endif()
 
 # Credit: https://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake/3818084

appveyor.yml

@@ -1,13 +1,13 @@
 version: 1.0.{build}
-os: Visual Studio 2015
+os: Visual Studio 2022
 clone_folder: C:\projects\muParser
 test: off
 branches:
   only:
     - master
 environment:
   matrix:
-    - CMAKE_PLATFORM: Visual Studio 14 2015
+    - CMAKE_PLATFORM: Visual Studio 17 2022
 build_script:
   - cmake -LAH -G "%CMAKE_PLATFORM%" -DCMAKE_INSTALL_PREFIX="%CD:\=/%/install" .
   - cmake --build . --config Release --target install

include/muParserTemplateMagic.h

@@ -118,13 +118,15 @@ namespace mu
 		static T Sin(T v) { return sin(v); }
 		static T Cos(T v) { return cos(v); }
 		static T Tan(T v) { return tan(v); }
+		static T Cot(T v) { return 1.0 / tan(v); }
 		static T ASin(T v) { return asin(v); }
 		static T ACos(T v) { return acos(v); }
 		static T ATan(T v) { return atan(v); }
 		static T ATan2(T v1, T v2) { return atan2(v1, v2); }
 		static T Sinh(T v) { return sinh(v); }
 		static T Cosh(T v) { return cosh(v); }
 		static T Tanh(T v) { return tanh(v); }
+		static T Coth(T v) { return 1.0 / tanh(v); }
 		static T ASinh(T v) { return log(v + sqrt(v * v + 1)); }
 		static T ACosh(T v) { return log(v + sqrt(v * v - 1)); }
 		static T ATanh(T v) { return ((T)0.5 * log((1 + v) / (1 - v))); }

src/muParser.cpp

@@ -148,6 +148,7 @@ namespace mu
 			DefineFun(_T("sin"), MathImpl<value_type>::Sin);
 			DefineFun(_T("cos"), MathImpl<value_type>::Cos);
 			DefineFun(_T("tan"), MathImpl<value_type>::Tan);
+			DefineFun(_T("cot"), MathImpl<value_type>::Cot);
 			// arcus functions
 			DefineFun(_T("asin"), MathImpl<value_type>::ASin);
 			DefineFun(_T("acos"), MathImpl<value_type>::ACos);
@@ -157,6 +158,7 @@ namespace mu
 			DefineFun(_T("sinh"), MathImpl<value_type>::Sinh);
 			DefineFun(_T("cosh"), MathImpl<value_type>::Cosh);
 			DefineFun(_T("tanh"), MathImpl<value_type>::Tanh);
+			DefineFun(_T("coth"), MathImpl<value_type>::Coth);
 			// arcus hyperbolic functions
 			DefineFun(_T("asinh"), MathImpl<value_type>::ASinh);
 			DefineFun(_T("acosh"), MathImpl<value_type>::ACosh);