research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for VS2010 / Matlab 2010a #include compatibility issues

Browse source
This commit is contained in:
Ray Speth 2012-02-04 16:45:26 +00:00
parent d29e31b039
commit 2ad16f1db3
17 changed files with 9 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cantera/matlab/src/ctfunctions.cpp
View file

@ -4,12 +4,6 @@
#include <string.h>
#include <iostream>
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ct.h>
#include <cantera/clib/ctonedim.h>
#include <cantera/clib/ctxml.h>

8
Cantera/matlab/src/ctmatutils.h
View file

@ -6,6 +6,14 @@ const double Undef = -999.123;
#include <string>
// Workaround for VS2010 and Matlab 2010a.
// mex.h must be included after <string> or another include from
// the standard library which includes <yvals.h>.
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
void reportError();
void checkNArgs(const int n, const int nrhs);

6
Cantera/matlab/src/ctmethods.cpp
View file

@ -11,12 +11,6 @@
#include <string>
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ct.h>
#include "ctmatutils.h"
#include "mllogger.h"

7
Cantera/matlab/src/flowdevicemethods.cpp
View file

@ -1,14 +1,7 @@
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include "ctmatutils.h"
#include <cantera/clib/ctreactor.h>
#include <cantera/clib/ct.h>
//const double Undef = -999.123;
void flowdevicemethods( int nlhs, mxArray *plhs[],

6
Cantera/matlab/src/funcmethods.cpp
View file

@ -1,9 +1,3 @@
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include "ctmatutils.h"
#include <cantera/clib/ctfunc.h>
#include <cantera/clib/ct.h>

6
Cantera/matlab/src/kineticsmethods.cpp
View file

@ -1,9 +1,3 @@
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include "ctmatutils.h"
#include <cantera/clib/ct.h>

6
Cantera/matlab/src/mixturemethods.cpp
View file

@ -3,12 +3,6 @@
*/
#include <iostream>
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ctmultiphase.h>
#include <cantera/clib/ct.h>
#include "ctmatutils.h"

3
Cantera/matlab/src/mllogger.h
View file

@ -4,8 +4,7 @@
#ifndef MLLOGGER_H
#define MLLOGGER_H
#include "mex.h"
#include <string>
#include "ctmatutils.h"
#include "cantera/kernel/logger.h"
#include <iostream>

6
Cantera/matlab/src/onedimmethods.cpp
View file

@ -1,12 +1,6 @@
#include <iostream>
#include <string>
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include "ctmatutils.h"
#include <cantera/clib/ctonedim.h>

6
Cantera/matlab/src/phasemethods.cpp
View file

@ -2,12 +2,6 @@
* @file phasemethods.cpp
*/
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include "ctmatutils.h"
#include <cantera/clib/ct.h>

6
Cantera/matlab/src/reactormethods.cpp
View file

@ -2,12 +2,6 @@
* @file reactormethods.cpp
*/
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ctreactor.h>
#include <cantera/clib/ct.h>
#include "ctmatutils.h"

6
Cantera/matlab/src/reactornetmethods.cpp
View file

@ -2,12 +2,6 @@
* @file reactornetmethods.cpp
*/
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ctreactor.h>
#include <cantera/clib/ct.h>
#include "ctmatutils.h"

7
Cantera/matlab/src/surfmethods.cpp
View file

@ -1,19 +1,12 @@
#include <iostream>
#include <string>
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include "ctmatutils.h"
#include <cantera/clib/ctsurf.h>
#include <cantera/clib/ct.h>
using namespace std;
namespace Cantera {
void writelog(const std::string& s);
}

6
Cantera/matlab/src/thermomethods.cpp
View file

@ -2,12 +2,6 @@
* @file thermomethods.cpp
*/
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ct.h>
#include "ctmatutils.h"

5
Cantera/matlab/src/transportmethods.cpp
View file

@ -1,10 +1,5 @@
#include <fstream>
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ct.h>
#include "ctmatutils.h"

6
Cantera/matlab/src/wallmethods.cpp
View file

@ -2,12 +2,6 @@
* @file wallmethods.cpp
*/
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ctreactor.h>
#include <cantera/clib/ct.h>
#include "ctmatutils.h"

6
Cantera/matlab/src/xmlmethods.cpp
View file

@ -2,12 +2,6 @@
* @file xmlmethods.cpp
*/
// Workaround for VS2010 and Matlab 2010a
#if (_MSC_VER >= 1600) && defined(_CHAR16T)
#define CHAR16_T char16_t
#endif
#include "mex.h"
#include <cantera/clib/ctxml.h>
#include <cantera/clib/ct.h>
#include "ctmatutils.h"