From 8bd114300a97aa61e1e751b537c5af75927d8673 Mon Sep 17 00:00:00 2001 From: sebastien Date: Fri, 30 Oct 2009 16:29:16 +0000 Subject: [PATCH] Various minor changes for compatibility with MS Visual C++ and GCC 4.4 git-svn-id: https://www.dynare.org/svn/dynare/trunk@3105 ac1d8469-bf42-47a9-8791-bf33cf982152 --- CodeInterpreter.hh | 12 ++++++++++++ ExprNode.cc | 9 --------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CodeInterpreter.hh b/CodeInterpreter.hh index 367cb241..abfa44d1 100644 --- a/CodeInterpreter.hh +++ b/CodeInterpreter.hh @@ -36,6 +36,18 @@ #endif #endif +#ifdef _MSC_VER +typedef __int8 int8_t; +typedef unsigned __int8 uint8_t; +typedef __int16 int16_t; +typedef unsigned __int16 uint16_t; +typedef __int32 int32_t; +typedef unsigned __int32 uint32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +#else +# include +#endif using namespace std; diff --git a/ExprNode.cc b/ExprNode.cc index 63007351..cb8ba7fb 100644 --- a/ExprNode.cc +++ b/ExprNode.cc @@ -1379,21 +1379,12 @@ UnaryOpNode::eval_opcode(UnaryOpcode op_code, double v) throw (EvalException) return(sinh(v)); case oTanh: return(tanh(v)); -#ifndef _WIN64 case oAcosh: return(acosh(v)); case oAsinh: return(asinh(v)); case oAtanh: return(atanh(v)); -#else - case oAcosh: - throw EvalException(); - case oAsinh: - throw EvalException(); - case oAtanh: - throw EvalException(); -#endif case oSqrt: return(sqrt(v)); case oSteadyState: