Workaround for char16_t definition when using Matlab2010a and VS2010

Cantera/matlab/src/ctfunctions.cpp

@@ -1,13 +1,20 @@
 /**
  *   @file ctfunctions.cpp
  */
+#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>
 #include "ctmatutils.h"
-#include <string.h>
-#include <iostream>
+
 using namespace std;
 
 void reportError() {

Cantera/matlab/src/ctmethods.cpp

@@ -9,9 +9,15 @@
  * class is indicated by the first parameter in the call from MATLAB.
  */
 
-#include <cantera/clib/ct.h>
 #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"
 

Cantera/matlab/src/flowdevicemethods.cpp

@@ -1,5 +1,9 @@
-
+// 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>

Cantera/matlab/src/funcmethods.cpp

@@ -1,5 +1,9 @@
-
+// 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>

Cantera/matlab/src/kineticsmethods.cpp

@@ -1,5 +1,9 @@
-
+// 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>
 

Cantera/matlab/src/mixturemethods.cpp

@@ -1,11 +1,17 @@
 /**
  * @file mixturemethods.cpp
  */
+#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"
-#include <iostream>
 using namespace std;
 
     void mixturemethods( int nlhs, mxArray *plhs[],

Cantera/matlab/src/onedimmethods.cpp

@@ -1,10 +1,15 @@
+#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>
 
-#include <iostream>
-#include <string>
 using namespace std;
 
 

Cantera/matlab/src/phasemethods.cpp

@@ -1,7 +1,13 @@
 /**
  *  @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>
 

Cantera/matlab/src/reactormethods.cpp

@@ -1,7 +1,13 @@
 /**
  * @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"

Cantera/matlab/src/reactornetmethods.cpp

@@ -1,7 +1,13 @@
 /**
  * @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"

Cantera/matlab/src/surfmethods.cpp

@@ -1,11 +1,16 @@
+#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>
 
-#include <iostream>
-#include <string>
 using namespace std;
 
 

Cantera/matlab/src/thermomethods.cpp

@@ -1,7 +1,13 @@
 /**
  *  @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"
 

Cantera/matlab/src/transportmethods.cpp

@@ -1,8 +1,12 @@
+#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"
-#include <fstream>
 
 void reportError();
 

Cantera/matlab/src/wallmethods.cpp

@@ -1,7 +1,13 @@
 /**
  *  @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"

Cantera/matlab/src/xmlmethods.cpp

@@ -1,7 +1,13 @@
 /**
  *  @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"