latest merge confirmed and fixed

beltoforion · Mar 26, 2016 · 1d74042 · 1d74042
1 parent 29dbbef
commit 1d74042
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
-#CC	=	g++
-#CFLAGS	=	-O3 -Wall -pedantic -ffast-math -fomit-frame-pointer 
+CC	=	g++ -std=c++11 -O3 -Wall -pedantic
+CFLAGS	=	-O3 -Wall -pedantic -ffast-math -fomit-frame-pointer 
 
-CC      = clang++
-CFLAGS	=	`llvm-config --ldflags` -O3 -Wall -pedantic -std=c++11
+#CC      = clang++
+#CFLAGS	=	`llvm-config --ldflags` -O3 -Wall -pedantic -std=c++11
 
 # debug version
 #CFLAGS  = -Wall -ggdb  

diff --git a/bin/README b/bin/README
diff --git a/obj/README b/obj/README
diff --git a/parser/mpDefines.h b/parser/mpDefines.h
@@ -62,7 +62,7 @@
 #endif
 
 /** \brief A macro containing the version of muParserX. */
-#define MUP_PARSER_VERSION _T("4.0.5 (2015-11-21)")
+#define MUP_PARSER_VERSION _T("4.0.6 (2016-03-26; Dev)")
 
 /** \brief A macro for setting the parser namespace. */
 #define MUP_NAMESPACE_START namespace mup {

diff --git a/parser/mpFuncNonCmplx.cpp b/parser/mpFuncNonCmplx.cpp
@@ -100,7 +100,7 @@ MUP_NAMESPACE_START
     MUP_UNARY_FUNC(FunLn,    "ln",    std::log,   "Natural logarithm")
     // square root
     MUP_UNARY_FUNC(FunSqrt,  "sqrt",  std::sqrt,  "sqrt(x) - square root of x")
-    MUP_UNARY_FUNC(FunCbrt,  "cbrt",  std::cqrt,  "cbrt(x) - cubic root of x")
+    MUP_UNARY_FUNC(FunCbrt,  "cbrt",  std::cbrt,  "cbrt(x) - cubic root of x")
     MUP_UNARY_FUNC(FunExp,   "exp",   std::exp,   "exp(x) - e to the power of x")
     MUP_UNARY_FUNC(FunAbs,   "abs",   std::fabs,  "abs(x) - absolute value of x")
 #undef MUP_UNARY_FUNC