diff --git a/Cantera/clib/src/clib_defs.h b/Cantera/clib/src/clib_defs.h index b8019a960..ddd54c88f 100755 --- a/Cantera/clib/src/clib_defs.h +++ b/Cantera/clib/src/clib_defs.h @@ -18,9 +18,6 @@ #define DLL_EXPORT __declspec(dllexport) #endif -#pragma warning(disable:4786) -#pragma warning(disable:4267) -#pragma warning(disable:4503) #else // On other platforms, we turn off the DLL macros. #define DLL_EXPORT diff --git a/Cantera/clib/src/ct.cpp b/Cantera/clib/src/ct.cpp index b3b36d87a..a01c9fbc3 100755 --- a/Cantera/clib/src/ct.cpp +++ b/Cantera/clib/src/ct.cpp @@ -7,11 +7,6 @@ * Cantera objects are stored and referenced by integers - no * pointers are passed to or from the calling application. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #define CANTERA_USE_INTERNAL #include "ct.h" diff --git a/Cantera/clib/src/ctbdry.cpp b/Cantera/clib/src/ctbdry.cpp index b895dab8e..6a4268c33 100755 --- a/Cantera/clib/src/ctbdry.cpp +++ b/Cantera/clib/src/ctbdry.cpp @@ -4,13 +4,6 @@ #define CANTERA_USE_INTERNAL #include "ctbdry.h" - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - - // Cantera includes #include "kernel/OneDim.h" #include "kernel/Inlet1D.h" diff --git a/Cantera/clib/src/ctfunc.cpp b/Cantera/clib/src/ctfunc.cpp index 8b1fd3f0b..44a872ee3 100755 --- a/Cantera/clib/src/ctfunc.cpp +++ b/Cantera/clib/src/ctfunc.cpp @@ -1,12 +1,6 @@ /** * @file ctfunc.cpp */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#pragma warning(disable:4996) -#endif - #define CANTERA_USE_INTERNAL #include "ctfunc.h" diff --git a/Cantera/clib/src/ctonedim.cpp b/Cantera/clib/src/ctonedim.cpp index 379493d24..5cb41fa7a 100644 --- a/Cantera/clib/src/ctonedim.cpp +++ b/Cantera/clib/src/ctonedim.cpp @@ -1,13 +1,6 @@ /** * @file ctonedim.cpp */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#pragma warning(disable:4800) -#endif - #define CANTERA_USE_INTERNAL #include "ctonedim.h" diff --git a/Cantera/clib/src/ctreactor.cpp b/Cantera/clib/src/ctreactor.cpp index 9c3e94b33..3b8432d82 100755 --- a/Cantera/clib/src/ctreactor.cpp +++ b/Cantera/clib/src/ctreactor.cpp @@ -1,11 +1,6 @@ /** * @file ctreactor.cpp */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #define CANTERA_USE_INTERNAL #include "ctreactor.h" diff --git a/Cantera/clib/src/ctsurf.cpp b/Cantera/clib/src/ctsurf.cpp index f06575c1b..3ba241a80 100755 --- a/Cantera/clib/src/ctsurf.cpp +++ b/Cantera/clib/src/ctsurf.cpp @@ -1,12 +1,6 @@ /** * @file ctsurf.cpp */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - // clib header information #define CANTERA_USE_INTERNAL #include "ctsurf.h" diff --git a/Cantera/clib/src/ctxml.cpp b/Cantera/clib/src/ctxml.cpp index 0126b92c6..1b86cb48d 100644 --- a/Cantera/clib/src/ctxml.cpp +++ b/Cantera/clib/src/ctxml.cpp @@ -1,11 +1,6 @@ /** * @file ctxml.cpp */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #define CANTERA_USE_INTERNAL #include "ctxml.h" diff --git a/Cantera/cxx/demos/flamespeed/flamespeed.cpp b/Cantera/cxx/demos/flamespeed/flamespeed.cpp index c55f6d7ba..65d5a396d 100644 --- a/Cantera/cxx/demos/flamespeed/flamespeed.cpp +++ b/Cantera/cxx/demos/flamespeed/flamespeed.cpp @@ -1,14 +1,3 @@ -// -#ifdef WIN32 -#pragma warning(disable:4786) -/*Warning messages that are identified as Warning C4786: are created - when MSVC generates extremely long names that it uses for debugging - purposes. The long names are generated by the template expansion - process and the warning messages normally can be ignored. Since these - warnings tend to hide more interesting warning/error messages, you may - wish to suppress the warning*/ -#endif - #include #include #include diff --git a/Cantera/cxx/demos/kinetics1/kinetics1.cpp b/Cantera/cxx/demos/kinetics1/kinetics1.cpp index b754e394b..f1b9d18d2 100644 --- a/Cantera/cxx/demos/kinetics1/kinetics1.cpp +++ b/Cantera/cxx/demos/kinetics1/kinetics1.cpp @@ -6,12 +6,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include diff --git a/Cantera/cxx/src/cxxutils.cpp b/Cantera/cxx/src/cxxutils.cpp index 7018580ed..c420afc8d 100644 --- a/Cantera/cxx/src/cxxutils.cpp +++ b/Cantera/cxx/src/cxxutils.cpp @@ -1,16 +1,7 @@ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "kernel/ThermoPhase.h" #include using namespace std; namespace Cantera { - - } - diff --git a/Cantera/fortran/f77demos/demo_ftnlib.cpp b/Cantera/fortran/f77demos/demo_ftnlib.cpp index bd9535296..4239878c7 100644 --- a/Cantera/fortran/f77demos/demo_ftnlib.cpp +++ b/Cantera/fortran/f77demos/demo_ftnlib.cpp @@ -25,12 +25,6 @@ */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - // add any other Cantera header files you need here #include #include diff --git a/Cantera/fortran/src/fct.cpp b/Cantera/fortran/src/fct.cpp index 5898837e5..afd629355 100644 --- a/Cantera/fortran/src/fct.cpp +++ b/Cantera/fortran/src/fct.cpp @@ -6,12 +6,6 @@ * Cantera objects are stored and referenced by integers - no * pointers are passed to or from the calling application. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - // Cantera includes #include "kernel/equil.h" #include "kernel/KineticsFactory.h" diff --git a/Cantera/fortran/src/flib_defs.h b/Cantera/fortran/src/flib_defs.h index 56f83ef18..b3a9455c1 100644 --- a/Cantera/fortran/src/flib_defs.h +++ b/Cantera/fortran/src/flib_defs.h @@ -5,8 +5,6 @@ #ifdef WIN32 #define DLL_IMPORT __declspec(dllimport) #define DLL_EXPORT __declspec(dllexport) -#pragma warning(disable:4786) -#pragma warning(disable:4503) #else #define DLL_EXPORT #define DLL_IMPORT diff --git a/Cantera/python/src/pycantera.cpp b/Cantera/python/src/pycantera.cpp index a77200d10..d39ecc216 100644 --- a/Cantera/python/src/pycantera.cpp +++ b/Cantera/python/src/pycantera.cpp @@ -5,12 +5,6 @@ * */ -// turn off warnings about long names under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "cantera/kernel/config.h" #include "Python.h" diff --git a/Cantera/src/base/checkFinite.cpp b/Cantera/src/base/checkFinite.cpp index 3ea139ce4..f0c7e2629 100644 --- a/Cantera/src/base/checkFinite.cpp +++ b/Cantera/src/base/checkFinite.cpp @@ -29,11 +29,8 @@ #ifdef WIN32 #include -#pragma warning(disable:4290) -#pragma warning(disable:4996) #endif - using namespace std; namespace mdp { diff --git a/Cantera/src/base/ct2ctml.cpp b/Cantera/src/base/ct2ctml.cpp index 62c291842..c132fde26 100644 --- a/Cantera/src/base/ct2ctml.cpp +++ b/Cantera/src/base/ct2ctml.cpp @@ -5,13 +5,6 @@ */ // Copyright 2001-2005 California Institute of Technology -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#pragma warning(disable:4996) -#endif - #include "ct_defs.h" #include "ctexceptions.h" #include "ctml.h" diff --git a/Cantera/src/base/ct_defs.h b/Cantera/src/base/ct_defs.h index 325747977..6e162c94f 100644 --- a/Cantera/src/base/ct_defs.h +++ b/Cantera/src/base/ct_defs.h @@ -34,7 +34,6 @@ namespace Cantera { #ifdef WIN32 #define TYPENAME_KEYWORD -#pragma warning(disable:4267) #else //! create a define for the typename command #define TYPENAME_KEYWORD typename diff --git a/Cantera/src/base/ctml.cpp b/Cantera/src/base/ctml.cpp index ed38248cc..d9b7f694f 100644 --- a/Cantera/src/base/ctml.cpp +++ b/Cantera/src/base/ctml.cpp @@ -5,13 +5,6 @@ */ // Copyright 2002 California Institute of Technology - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ctml.h" //@{ diff --git a/Cantera/src/base/mdp_allo.cpp b/Cantera/src/base/mdp_allo.cpp index a390e2978..f43766010 100644 --- a/Cantera/src/base/mdp_allo.cpp +++ b/Cantera/src/base/mdp_allo.cpp @@ -19,10 +19,6 @@ using namespace std; -#ifdef WIN32 -#pragma warning(disable:4996) -#endif - namespace mdp { /* * Allocate global storage for 2 debugging ints that are used in IO of diff --git a/Cantera/src/base/mdp_allo.h b/Cantera/src/base/mdp_allo.h index 48bc3a547..958c22db8 100644 --- a/Cantera/src/base/mdp_allo.h +++ b/Cantera/src/base/mdp_allo.h @@ -14,10 +14,6 @@ #ifndef MDP_ALLO_H #define MDP_ALLO_H -#ifdef WIN32 -#pragma warning(disable:4290) -#endif - #include /* diff --git a/Cantera/src/base/misc.cpp b/Cantera/src/base/misc.cpp index a2066ed8d..5ad0fd899 100644 --- a/Cantera/src/base/misc.cpp +++ b/Cantera/src/base/misc.cpp @@ -9,11 +9,6 @@ * logs * HTML_logs */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#pragma warning(disable:4996) -#endif // RFB:TODO May need OS specifc include to use varargs.h instead #include diff --git a/Cantera/src/base/plots.cpp b/Cantera/src/base/plots.cpp index b61dcbfb8..1e06767b0 100644 --- a/Cantera/src/base/plots.cpp +++ b/Cantera/src/base/plots.cpp @@ -3,12 +3,6 @@ */ // Copyright 2002 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "plots.h" using namespace std; diff --git a/Cantera/src/base/stringUtils.cpp b/Cantera/src/base/stringUtils.cpp index 1603b987f..cf4a1d7e6 100644 --- a/Cantera/src/base/stringUtils.cpp +++ b/Cantera/src/base/stringUtils.cpp @@ -9,9 +9,6 @@ #include "ct_defs.h" #ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#pragma warning(disable:4996) #define SNPRINTF _snprintf #else #define SNPRINTF snprintf diff --git a/Cantera/src/base/utilities.h b/Cantera/src/base/utilities.h index be8e3be5c..6e8482760 100644 --- a/Cantera/src/base/utilities.h +++ b/Cantera/src/base/utilities.h @@ -18,10 +18,6 @@ #include "ct_defs.h" -#ifdef WIN32 -#pragma warning(disable:4996) -#endif - //! Unary operator to multiply the argument by a constant. /*! * The form of this operator is designed for use by std::transform. diff --git a/Cantera/src/base/xml.cpp b/Cantera/src/base/xml.cpp index 662911a5a..1816da809 100644 --- a/Cantera/src/base/xml.cpp +++ b/Cantera/src/base/xml.cpp @@ -6,14 +6,6 @@ */ // Copyright 2001 California Institute of Technology - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#pragma warning(disable:4996) -#endif - #include "config.h" #ifdef HAS_SSTREAM #include diff --git a/Cantera/src/converters/CKParser.cpp b/Cantera/src/converters/CKParser.cpp index b91385e7d..77fc0de99 100755 --- a/Cantera/src/converters/CKParser.cpp +++ b/Cantera/src/converters/CKParser.cpp @@ -5,11 +5,6 @@ // Copyright 2001 California Institute of Technology -// turn off warnings about truncating long names under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include #include diff --git a/Cantera/src/converters/CKParser.h b/Cantera/src/converters/CKParser.h index f8da04605..a34b7bde2 100755 --- a/Cantera/src/converters/CKParser.h +++ b/Cantera/src/converters/CKParser.h @@ -5,14 +5,9 @@ // Copyright 2001 California Institute of Technology - #ifndef CKR_CKPARSER_H #define CKR_CKPARSER_H -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include #include diff --git a/Cantera/src/converters/CKReader.cpp b/Cantera/src/converters/CKReader.cpp index 02c251e60..e05897fcf 100755 --- a/Cantera/src/converters/CKReader.cpp +++ b/Cantera/src/converters/CKReader.cpp @@ -5,12 +5,6 @@ // Copyright 2001 California Institute of Technology - -// disable warning about long names in Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include using namespace std; diff --git a/Cantera/src/converters/CKReader.h b/Cantera/src/converters/CKReader.h index 4c4274c7a..56515423a 100755 --- a/Cantera/src/converters/CKReader.h +++ b/Cantera/src/converters/CKReader.h @@ -5,14 +5,9 @@ // Copyright 2001 California Institute of Technology - #ifndef CKR_CKRREADER_H #define CKR_CKRREADER_H -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include #include diff --git a/Cantera/src/converters/Reaction.cpp b/Cantera/src/converters/Reaction.cpp index fd4b57d2d..d7c26c81f 100755 --- a/Cantera/src/converters/Reaction.cpp +++ b/Cantera/src/converters/Reaction.cpp @@ -5,11 +5,6 @@ // Copyright 2001 California Institute of Technology -// turn off warnings about truncating long names under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "Reaction.h" #include #include diff --git a/Cantera/src/converters/atomicWeightDB.cpp b/Cantera/src/converters/atomicWeightDB.cpp index 8a8965b94..6d1157e0a 100755 --- a/Cantera/src/converters/atomicWeightDB.cpp +++ b/Cantera/src/converters/atomicWeightDB.cpp @@ -7,12 +7,6 @@ // Copyright 2001 California Institute of Technology - -// turn off warnings about truncating long names under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include #include diff --git a/Cantera/src/converters/ck2ct.cpp b/Cantera/src/converters/ck2ct.cpp index 32172dc62..638f6d459 100644 --- a/Cantera/src/converters/ck2ct.cpp +++ b/Cantera/src/converters/ck2ct.cpp @@ -2,11 +2,6 @@ * @file ck2ct.cpp * Convert CK-format reaction mechanism files to Cantera input format. */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include diff --git a/Cantera/src/converters/ckr_utils.cpp b/Cantera/src/converters/ckr_utils.cpp index c511bb688..4adc4ecb0 100755 --- a/Cantera/src/converters/ckr_utils.cpp +++ b/Cantera/src/converters/ckr_utils.cpp @@ -5,12 +5,6 @@ // Copyright 2001 California Institute of Technology - -// turn off warnings about truncating long names under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include diff --git a/Cantera/src/converters/ckr_utils.h b/Cantera/src/converters/ckr_utils.h index 634a6ace4..7438c742d 100755 --- a/Cantera/src/converters/ckr_utils.h +++ b/Cantera/src/converters/ckr_utils.h @@ -8,10 +8,6 @@ #ifndef CKR_UTILS_H #define CKR_UTILS_H -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include #include diff --git a/Cantera/src/converters/thermoFunctions.cpp b/Cantera/src/converters/thermoFunctions.cpp index 60dbb39d6..855b14315 100755 --- a/Cantera/src/converters/thermoFunctions.cpp +++ b/Cantera/src/converters/thermoFunctions.cpp @@ -6,12 +6,6 @@ // Copyright 2001 California Institute of Technology - -// turn off warnings about truncating long names under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include "thermoFunctions.h" #include diff --git a/Cantera/src/converters/thermoFunctions.h b/Cantera/src/converters/thermoFunctions.h index 6b12b9285..43c507c4c 100755 --- a/Cantera/src/converters/thermoFunctions.h +++ b/Cantera/src/converters/thermoFunctions.h @@ -7,14 +7,9 @@ // Copyright 2001 California Institute of Technology - #ifndef CKR_THERMOFUNCTIONS_H #define CKR_THERMOFUNCTIONS_H -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "Species.h" namespace ckr { diff --git a/Cantera/src/converters/writelog.cpp b/Cantera/src/converters/writelog.cpp index bc1fec378..7eaf8366a 100755 --- a/Cantera/src/converters/writelog.cpp +++ b/Cantera/src/converters/writelog.cpp @@ -5,12 +5,6 @@ // Copyright 2001 California Institute of Technology - -// turn off warnings about truncating long names under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include #include "writelog.h" diff --git a/Cantera/src/equil/ChemEquil.cpp b/Cantera/src/equil/ChemEquil.cpp index c25a09275..fc52451cf 100755 --- a/Cantera/src/equil/ChemEquil.cpp +++ b/Cantera/src/equil/ChemEquil.cpp @@ -6,11 +6,6 @@ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include "ChemEquil.h" diff --git a/Cantera/src/equil/vcs_solve_TP.cpp b/Cantera/src/equil/vcs_solve_TP.cpp index 010918483..6d4ba7228 100644 --- a/Cantera/src/equil/vcs_solve_TP.cpp +++ b/Cantera/src/equil/vcs_solve_TP.cpp @@ -20,10 +20,6 @@ #include "clockWC.h" -#ifdef WIN32 -#pragma warning(disable:4996) -#endif - using namespace std; namespace VCSnonideal { diff --git a/Cantera/src/kinetics/AqueousKinetics.cpp b/Cantera/src/kinetics/AqueousKinetics.cpp index 645c80e2a..6e9fc3ac9 100644 --- a/Cantera/src/kinetics/AqueousKinetics.cpp +++ b/Cantera/src/kinetics/AqueousKinetics.cpp @@ -10,10 +10,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "AqueousKinetics.h" #include "ReactionData.h" diff --git a/Cantera/src/kinetics/FalloffFactory.cpp b/Cantera/src/kinetics/FalloffFactory.cpp index 5c505b3db..7f0655f3b 100644 --- a/Cantera/src/kinetics/FalloffFactory.cpp +++ b/Cantera/src/kinetics/FalloffFactory.cpp @@ -3,12 +3,6 @@ */ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - - #include "FalloffFactory.h" #include "ctexceptions.h" diff --git a/Cantera/src/kinetics/GRI_30_Kinetics.cpp b/Cantera/src/kinetics/GRI_30_Kinetics.cpp index 1d5a1ba85..e7bcc4e6a 100644 --- a/Cantera/src/kinetics/GRI_30_Kinetics.cpp +++ b/Cantera/src/kinetics/GRI_30_Kinetics.cpp @@ -6,13 +6,6 @@ // Copyright 2001 California Institute of Technology - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "GRI_30_Kinetics.h" #include "ReactionData.h" diff --git a/Cantera/src/kinetics/GasKinetics.cpp b/Cantera/src/kinetics/GasKinetics.cpp index fa4ff9aaa..5f6fc65ef 100644 --- a/Cantera/src/kinetics/GasKinetics.cpp +++ b/Cantera/src/kinetics/GasKinetics.cpp @@ -7,13 +7,6 @@ // Copyright 2001 California Institute of Technology - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "GasKinetics.h" #include "ReactionData.h" diff --git a/Cantera/src/kinetics/Group.cpp b/Cantera/src/kinetics/Group.cpp index 0305b9503..dfcf15156 100644 --- a/Cantera/src/kinetics/Group.cpp +++ b/Cantera/src/kinetics/Group.cpp @@ -8,11 +8,6 @@ // reaction path analysis support -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "Group.h" #include diff --git a/Cantera/src/kinetics/ImplicitSurfChem.cpp b/Cantera/src/kinetics/ImplicitSurfChem.cpp index 77d7fc5e5..76cb7183c 100644 --- a/Cantera/src/kinetics/ImplicitSurfChem.cpp +++ b/Cantera/src/kinetics/ImplicitSurfChem.cpp @@ -6,12 +6,6 @@ */ // Copyright 2001 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ImplicitSurfChem.h" #include "Integrator.h" #include "solveSP.h" diff --git a/Cantera/src/kinetics/ImplicitSurfChem.h b/Cantera/src/kinetics/ImplicitSurfChem.h index af44d5356..249e9ab18 100644 --- a/Cantera/src/kinetics/ImplicitSurfChem.h +++ b/Cantera/src/kinetics/ImplicitSurfChem.h @@ -6,15 +6,9 @@ */ // Copyright 2001 California Institute of Technology - #ifndef CT_IMPSURFCHEM_H #define CT_IMPSURFCHEM_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "FuncEval.h" #include "Integrator.h" #include "InterfaceKinetics.h" diff --git a/Cantera/src/kinetics/InterfaceKinetics.cpp b/Cantera/src/kinetics/InterfaceKinetics.cpp index 2f5cd0cd7..8091d77fc 100644 --- a/Cantera/src/kinetics/InterfaceKinetics.cpp +++ b/Cantera/src/kinetics/InterfaceKinetics.cpp @@ -5,13 +5,6 @@ // Copyright 2002 California Institute of Technology - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "InterfaceKinetics.h" #include "EdgeKinetics.h" #include "SurfPhase.h" diff --git a/Cantera/src/kinetics/KineticsFactory.cpp b/Cantera/src/kinetics/KineticsFactory.cpp index 5e2a90eed..e1814ae70 100644 --- a/Cantera/src/kinetics/KineticsFactory.cpp +++ b/Cantera/src/kinetics/KineticsFactory.cpp @@ -3,11 +3,6 @@ */ // Copyright 2001 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "KineticsFactory.h" #include "GasKinetics.h" diff --git a/Cantera/src/kinetics/ReactionPath.cpp b/Cantera/src/kinetics/ReactionPath.cpp index c7cb13034..2d653e3f0 100644 --- a/Cantera/src/kinetics/ReactionPath.cpp +++ b/Cantera/src/kinetics/ReactionPath.cpp @@ -4,11 +4,6 @@ */ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ReactionPath.h" #include "Kinetics.h" #include "reaction_defs.h" diff --git a/Cantera/src/kinetics/ReactionStoichMgr.cpp b/Cantera/src/kinetics/ReactionStoichMgr.cpp index 67b5ee1ef..8f227adff 100644 --- a/Cantera/src/kinetics/ReactionStoichMgr.cpp +++ b/Cantera/src/kinetics/ReactionStoichMgr.cpp @@ -5,13 +5,6 @@ /// //------------------------------------------------ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - - #include "ReactionStoichMgr.h" #include "StoichManager.h" #include "ctexceptions.h" diff --git a/Cantera/src/kinetics/importKinetics.cpp b/Cantera/src/kinetics/importKinetics.cpp index 968bd78ca..035ba5225 100644 --- a/Cantera/src/kinetics/importKinetics.cpp +++ b/Cantera/src/kinetics/importKinetics.cpp @@ -11,11 +11,6 @@ */ // Copyright 2002 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "importKinetics.h" #include "mix_defs.h" #include diff --git a/Cantera/src/numerics/BandMatrix.cpp b/Cantera/src/numerics/BandMatrix.cpp index b643fe1b2..69649fff7 100755 --- a/Cantera/src/numerics/BandMatrix.cpp +++ b/Cantera/src/numerics/BandMatrix.cpp @@ -6,11 +6,6 @@ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "BandMatrix.h" #include "ctlapack.h" #include "utilities.h" diff --git a/Cantera/src/numerics/CVodeInt.h b/Cantera/src/numerics/CVodeInt.h index 19e2d9713..4d4c739cf 100644 --- a/Cantera/src/numerics/CVodeInt.h +++ b/Cantera/src/numerics/CVodeInt.h @@ -3,15 +3,9 @@ */ // Copyright 2001 California Institute of Technology - #ifndef CT_CVODEINT_H #define CT_CVODEINT_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "Integrator.h" #include "FuncEval.h" #include "ctexceptions.h" diff --git a/Cantera/src/numerics/CVodesIntegrator.h b/Cantera/src/numerics/CVodesIntegrator.h index 9cfcd1a07..d7bb167d1 100644 --- a/Cantera/src/numerics/CVodesIntegrator.h +++ b/Cantera/src/numerics/CVodesIntegrator.h @@ -3,17 +3,11 @@ */ // Copyright 2005 California Institute of Technology - #ifndef CT_CVODESWRAPPER_H #define CT_CVODESWRAPPER_H #ifdef HAS_SUNDIALS -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "Integrator.h" #include "FuncEval.h" #include "ctexceptions.h" diff --git a/Cantera/src/numerics/DenseMatrix.cpp b/Cantera/src/numerics/DenseMatrix.cpp index 762e4e393..0210d667a 100755 --- a/Cantera/src/numerics/DenseMatrix.cpp +++ b/Cantera/src/numerics/DenseMatrix.cpp @@ -4,11 +4,6 @@ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "ctlapack.h" #include "utilities.h" diff --git a/Cantera/src/numerics/Func1.h b/Cantera/src/numerics/Func1.h index f751f25b1..31cb07956 100644 --- a/Cantera/src/numerics/Func1.h +++ b/Cantera/src/numerics/Func1.h @@ -9,12 +9,6 @@ #undef DEBUG_FUNC - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include diff --git a/Cantera/src/numerics/FuncEval.h b/Cantera/src/numerics/FuncEval.h index d88181533..d155a0005 100755 --- a/Cantera/src/numerics/FuncEval.h +++ b/Cantera/src/numerics/FuncEval.h @@ -8,11 +8,6 @@ #ifndef CT_FUNCEVAL_H #define CT_FUNCEVAL_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" namespace Cantera { diff --git a/Cantera/src/numerics/Integrator.h b/Cantera/src/numerics/Integrator.h index 2f3be92c0..3ca34b6d8 100644 --- a/Cantera/src/numerics/Integrator.h +++ b/Cantera/src/numerics/Integrator.h @@ -10,18 +10,11 @@ #ifndef CT_INTEGRATOR_H #define CT_INTEGRATOR_H - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "FuncEval.h" #include "ct_defs.h" #include "global.h" - namespace Cantera { const int DIAG = 1; diff --git a/Cantera/src/numerics/ResidEval.h b/Cantera/src/numerics/ResidEval.h index da4e4409f..9f8315649 100755 --- a/Cantera/src/numerics/ResidEval.h +++ b/Cantera/src/numerics/ResidEval.h @@ -7,11 +7,6 @@ #ifndef CT_RESIDEVAL_H #define CT_RESIDEVAL_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "ctexceptions.h" diff --git a/Cantera/src/numerics/funcs.cpp b/Cantera/src/numerics/funcs.cpp index 957611dfb..262fcd3dd 100755 --- a/Cantera/src/numerics/funcs.cpp +++ b/Cantera/src/numerics/funcs.cpp @@ -7,11 +7,6 @@ * See file License.txt for licensing information */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include diff --git a/Cantera/src/numerics/sort.cpp b/Cantera/src/numerics/sort.cpp index b7ed25ec9..91ce6f974 100755 --- a/Cantera/src/numerics/sort.cpp +++ b/Cantera/src/numerics/sort.cpp @@ -2,10 +2,6 @@ * @file sort.cpp */ -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "sort.h" namespace Cantera { diff --git a/Cantera/src/oneD/MultiJac.cpp b/Cantera/src/oneD/MultiJac.cpp index 0bbcb6f4b..d99cec7b1 100644 --- a/Cantera/src/oneD/MultiJac.cpp +++ b/Cantera/src/oneD/MultiJac.cpp @@ -8,12 +8,6 @@ * Copyright 2002 California Institute of Technology */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - - #include "MultiJac.h" using namespace std; diff --git a/Cantera/src/oneD/MultiNewton.cpp b/Cantera/src/oneD/MultiNewton.cpp index a463a2aac..a321d4006 100644 --- a/Cantera/src/oneD/MultiNewton.cpp +++ b/Cantera/src/oneD/MultiNewton.cpp @@ -8,11 +8,6 @@ * Copyright 2001 California Institute of Technology */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include using namespace std; diff --git a/Cantera/src/oneD/OneDim.cpp b/Cantera/src/oneD/OneDim.cpp index a54602ce2..728e02d0f 100644 --- a/Cantera/src/oneD/OneDim.cpp +++ b/Cantera/src/oneD/OneDim.cpp @@ -1,9 +1,3 @@ - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "MultiJac.h" #include "MultiNewton.h" #include "OneDim.h" diff --git a/Cantera/src/oneD/Sim1D.cpp b/Cantera/src/oneD/Sim1D.cpp index d804a4564..01355ede1 100644 --- a/Cantera/src/oneD/Sim1D.cpp +++ b/Cantera/src/oneD/Sim1D.cpp @@ -1,9 +1,3 @@ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - /** * @file Sim1D.cpp */ diff --git a/Cantera/src/oneD/Sim1D.h b/Cantera/src/oneD/Sim1D.h index 8b50cc098..833f2465d 100644 --- a/Cantera/src/oneD/Sim1D.h +++ b/Cantera/src/oneD/Sim1D.h @@ -5,10 +5,6 @@ #ifndef CT_SIM1D_H #define CT_SIM1D_H -#ifdef WIN32 -#pragma warning(disable:4996) -#endif - #include "OneDim.h" #include "funcs.h" diff --git a/Cantera/src/oneD/StFlow.cpp b/Cantera/src/oneD/StFlow.cpp index 86cdc0e23..2d9bb35a7 100644 --- a/Cantera/src/oneD/StFlow.cpp +++ b/Cantera/src/oneD/StFlow.cpp @@ -3,14 +3,6 @@ */ // Copyright 2002 California Institute of Technology - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#pragma warning(disable:4267) -#endif - #include #include diff --git a/Cantera/src/oneD/boundaries1D.cpp b/Cantera/src/oneD/boundaries1D.cpp index 1d3ebc8b0..a9bb59ad6 100644 --- a/Cantera/src/oneD/boundaries1D.cpp +++ b/Cantera/src/oneD/boundaries1D.cpp @@ -3,12 +3,6 @@ */ // Copyright 2002-3 California Institute of Technology -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "Inlet1D.h" using namespace std; diff --git a/Cantera/src/oneD/newton_utils.cpp b/Cantera/src/oneD/newton_utils.cpp index 516d01c88..d837d4a65 100644 --- a/Cantera/src/oneD/newton_utils.cpp +++ b/Cantera/src/oneD/newton_utils.cpp @@ -2,11 +2,6 @@ * @file newton_utils.cpp */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "Domain1D.h" diff --git a/Cantera/src/oneD/refine.cpp b/Cantera/src/oneD/refine.cpp index c679b9874..115a6c147 100644 --- a/Cantera/src/oneD/refine.cpp +++ b/Cantera/src/oneD/refine.cpp @@ -1,10 +1,3 @@ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - - #include #include #include "Domain1D.h" diff --git a/Cantera/src/spectra/rotor.cpp b/Cantera/src/spectra/rotor.cpp index ea9d7a31a..f993fe61c 100644 --- a/Cantera/src/spectra/rotor.cpp +++ b/Cantera/src/spectra/rotor.cpp @@ -2,11 +2,6 @@ * @file rotor.cpp * */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "rotor.h" diff --git a/Cantera/src/thermo/ConstDensityThermo.cpp b/Cantera/src/thermo/ConstDensityThermo.cpp index bfc7fc617..119b17c5c 100644 --- a/Cantera/src/thermo/ConstDensityThermo.cpp +++ b/Cantera/src/thermo/ConstDensityThermo.cpp @@ -6,12 +6,6 @@ */ // Copyright 2002 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "mix_defs.h" #include "ConstDensityThermo.h" diff --git a/Cantera/src/thermo/Constituents.cpp b/Cantera/src/thermo/Constituents.cpp index 920d361d0..8e4892f38 100644 --- a/Cantera/src/thermo/Constituents.cpp +++ b/Cantera/src/thermo/Constituents.cpp @@ -5,11 +5,6 @@ */ // Copyright 2001 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "Constituents.h" #include "Elements.h" using namespace std; diff --git a/Cantera/src/thermo/Elements.cpp b/Cantera/src/thermo/Elements.cpp index 4bb7e1d16..cf412ad11 100644 --- a/Cantera/src/thermo/Elements.cpp +++ b/Cantera/src/thermo/Elements.cpp @@ -8,11 +8,6 @@ */ // Copyright 2003 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "Elements.h" #include "xml.h" #include "ctml.h" diff --git a/Cantera/src/thermo/IdealGasPhase.cpp b/Cantera/src/thermo/IdealGasPhase.cpp index 6bb3a4bfc..4b1f5c92e 100644 --- a/Cantera/src/thermo/IdealGasPhase.cpp +++ b/Cantera/src/thermo/IdealGasPhase.cpp @@ -1,15 +1,9 @@ /** - * * @file IdealGasPhase.cpp * ThermoPhase object for the ideal gas equation of * state - workhorse for %Cantera (see \ref thermoprops * and class \link Cantera::IdealGasPhase IdealGasPhase\endlink). - * */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "ct_defs.h" #include "mix_defs.h" diff --git a/Cantera/src/thermo/IdealSolnGasVPSS.cpp b/Cantera/src/thermo/IdealSolnGasVPSS.cpp index 2ab2bd90c..daf160c75 100644 --- a/Cantera/src/thermo/IdealSolnGasVPSS.cpp +++ b/Cantera/src/thermo/IdealSolnGasVPSS.cpp @@ -11,11 +11,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "IdealSolnGasVPSS.h" #include "VPSSMgr.h" diff --git a/Cantera/src/thermo/LatticePhase.cpp b/Cantera/src/thermo/LatticePhase.cpp index b8df0ac0d..b13760c4e 100644 --- a/Cantera/src/thermo/LatticePhase.cpp +++ b/Cantera/src/thermo/LatticePhase.cpp @@ -10,11 +10,6 @@ #include "config.h" #ifdef WITH_LATTICE_SOLID -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "mix_defs.h" #include "LatticePhase.h" diff --git a/Cantera/src/thermo/LatticeSolidPhase.cpp b/Cantera/src/thermo/LatticeSolidPhase.cpp index be356050d..7b6cbda74 100644 --- a/Cantera/src/thermo/LatticeSolidPhase.cpp +++ b/Cantera/src/thermo/LatticeSolidPhase.cpp @@ -2,11 +2,6 @@ * @file LatticeSolidPhase.cpp */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "config.h" #ifdef WITH_LATTICE_SOLID diff --git a/Cantera/src/thermo/PDSSFactory.cpp b/Cantera/src/thermo/PDSSFactory.cpp index dbf88cf50..d279ced48 100644 --- a/Cantera/src/thermo/PDSSFactory.cpp +++ b/Cantera/src/thermo/PDSSFactory.cpp @@ -6,11 +6,6 @@ */ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - - #include "SpeciesThermoFactory.h" using namespace std; diff --git a/Cantera/src/thermo/Phase.cpp b/Cantera/src/thermo/Phase.cpp index 423aa8c24..fd669ca83 100644 --- a/Cantera/src/thermo/Phase.cpp +++ b/Cantera/src/thermo/Phase.cpp @@ -7,11 +7,6 @@ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "Phase.h" #include "vec_functions.h" diff --git a/Cantera/src/thermo/SpeciesThermoFactory.cpp b/Cantera/src/thermo/SpeciesThermoFactory.cpp index b71fbf9af..526255202 100644 --- a/Cantera/src/thermo/SpeciesThermoFactory.cpp +++ b/Cantera/src/thermo/SpeciesThermoFactory.cpp @@ -6,11 +6,6 @@ */ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - - #include "SpeciesThermoFactory.h" using namespace std; @@ -39,7 +34,6 @@ using namespace std; using namespace ctml; - namespace Cantera { SpeciesThermoFactory* SpeciesThermoFactory::s_factory = 0; @@ -47,9 +41,7 @@ namespace Cantera { #if defined(THREAD_SAFE_CANTERA) boost::mutex SpeciesThermoFactory::species_thermo_mutex ; #endif - - //! Examine the types of species thermo parameterizations, //! and return a flag indicating the type of reference state thermo manager //! that will be needed in order to evaluate them all. diff --git a/Cantera/src/thermo/State.h b/Cantera/src/thermo/State.h index 1e0b340c8..290e516fb 100644 --- a/Cantera/src/thermo/State.h +++ b/Cantera/src/thermo/State.h @@ -16,12 +16,7 @@ #include "ct_defs.h" #include "utilities.h" -#ifdef WIN32 -#pragma warning(disable:4996) -#endif - namespace Cantera { - //! Manages the independent variables of temperature, mass density, //! and species mass/mole fraction that define the thermodynamic diff --git a/Cantera/src/thermo/StoichSubstance.cpp b/Cantera/src/thermo/StoichSubstance.cpp index 70098164d..3d7143575 100644 --- a/Cantera/src/thermo/StoichSubstance.cpp +++ b/Cantera/src/thermo/StoichSubstance.cpp @@ -1,5 +1,4 @@ /** - * * @file StoichSubstance.cpp * This file contains the class definitions for the StoichSubstance * ThermoPhase class. @@ -7,11 +6,6 @@ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "mix_defs.h" #include "StoichSubstance.h" @@ -19,7 +13,6 @@ namespace Cantera { - // Default empty constructor StoichSubstance::StoichSubstance() : m_kk(0), diff --git a/Cantera/src/thermo/SurfPhase.cpp b/Cantera/src/thermo/SurfPhase.cpp index 3399a67ff..0e826c1b1 100644 --- a/Cantera/src/thermo/SurfPhase.cpp +++ b/Cantera/src/thermo/SurfPhase.cpp @@ -7,12 +7,6 @@ */ // Copyright 2002 California Institute of Technology -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "SurfPhase.h" #include "EdgePhase.h" #include "ThermoFactory.h" diff --git a/Cantera/src/thermo/ThermoFactory.cpp b/Cantera/src/thermo/ThermoFactory.cpp index 6b7a7fb38..e99b3d510 100644 --- a/Cantera/src/thermo/ThermoFactory.cpp +++ b/Cantera/src/thermo/ThermoFactory.cpp @@ -6,11 +6,6 @@ */ // Copyright 2001 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "ThermoFactory.h" #include "speciesThermoTypes.h" diff --git a/Cantera/src/thermo/ThermoPhase.cpp b/Cantera/src/thermo/ThermoPhase.cpp index 3614ee024..f4c501070 100644 --- a/Cantera/src/thermo/ThermoPhase.cpp +++ b/Cantera/src/thermo/ThermoPhase.cpp @@ -7,12 +7,6 @@ // Copyright 2002 California Institute of Technology -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ThermoPhase.h" #include diff --git a/Cantera/src/thermo/VPSSMgr.cpp b/Cantera/src/thermo/VPSSMgr.cpp index 621e48a81..0fd6bf39a 100644 --- a/Cantera/src/thermo/VPSSMgr.cpp +++ b/Cantera/src/thermo/VPSSMgr.cpp @@ -11,11 +11,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "VPSSMgr.h" #include "VPStandardStateTP.h" diff --git a/Cantera/src/thermo/VPSSMgrFactory.cpp b/Cantera/src/thermo/VPSSMgrFactory.cpp index 5f5913ff5..db82f5087 100644 --- a/Cantera/src/thermo/VPSSMgrFactory.cpp +++ b/Cantera/src/thermo/VPSSMgrFactory.cpp @@ -10,14 +10,9 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "SpeciesThermo.h" - #include "VPSSMgr.h" #include "VPSSMgrFactory.h" @@ -45,7 +40,6 @@ using namespace ctml; using namespace std; - namespace Cantera { VPSSMgrFactory* VPSSMgrFactory::s_factory = 0; diff --git a/Cantera/src/thermo/VPSSMgr_ConstVol.cpp b/Cantera/src/thermo/VPSSMgr_ConstVol.cpp index 8c6a71f11..c33d73197 100644 --- a/Cantera/src/thermo/VPSSMgr_ConstVol.cpp +++ b/Cantera/src/thermo/VPSSMgr_ConstVol.cpp @@ -11,11 +11,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "VPSSMgr_ConstVol.h" #include "xml.h" diff --git a/Cantera/src/thermo/VPSSMgr_General.cpp b/Cantera/src/thermo/VPSSMgr_General.cpp index 27c36e847..dfed2a7aa 100644 --- a/Cantera/src/thermo/VPSSMgr_General.cpp +++ b/Cantera/src/thermo/VPSSMgr_General.cpp @@ -11,11 +11,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "VPSSMgr_General.h" #include "PDSS.h" @@ -33,7 +28,6 @@ using namespace std; namespace Cantera { - VPSSMgr_General::VPSSMgr_General(VPStandardStateTP *vp_ptr, SpeciesThermo *spth) : VPSSMgr(vp_ptr, spth) @@ -45,7 +39,6 @@ namespace Cantera { m_useTmpRefStateStorage = true; } - VPSSMgr_General::~VPSSMgr_General() { } diff --git a/Cantera/src/thermo/VPSSMgr_IdealGas.cpp b/Cantera/src/thermo/VPSSMgr_IdealGas.cpp index 1b5ccad5b..9de797161 100644 --- a/Cantera/src/thermo/VPSSMgr_IdealGas.cpp +++ b/Cantera/src/thermo/VPSSMgr_IdealGas.cpp @@ -11,11 +11,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "VPSSMgr_IdealGas.h" #include "utilities.h" @@ -36,7 +31,6 @@ namespace Cantera { m_useTmpStandardStateStorage = true; } - VPSSMgr_IdealGas::~VPSSMgr_IdealGas() { } diff --git a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp b/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp index 6e4931c3a..41c22d4c3 100644 --- a/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp +++ b/Cantera/src/thermo/VPSSMgr_Water_ConstVol.cpp @@ -13,11 +13,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "VPSSMgr_Water_ConstVol.h" #include "PDSS_Water.h" diff --git a/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp b/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp index a8df8d802..7042442d8 100644 --- a/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp +++ b/Cantera/src/thermo/VPSSMgr_Water_HKFT.cpp @@ -13,11 +13,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "VPSSMgr_Water_HKFT.h" #include "PDSS_Water.h" diff --git a/Cantera/src/thermo/VPStandardStateTP.cpp b/Cantera/src/thermo/VPStandardStateTP.cpp index b09564983..b28180606 100644 --- a/Cantera/src/thermo/VPStandardStateTP.cpp +++ b/Cantera/src/thermo/VPStandardStateTP.cpp @@ -10,11 +10,6 @@ * Contract DE-AC04-94AL85000 with Sandia Corporation, the * U.S. Government retains certain rights in this software. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "VPStandardStateTP.h" #include "VPSSMgr.h" diff --git a/Cantera/src/thermo/phasereport.cpp b/Cantera/src/thermo/phasereport.cpp index ed8881b40..b03ac5dc4 100644 --- a/Cantera/src/thermo/phasereport.cpp +++ b/Cantera/src/thermo/phasereport.cpp @@ -5,12 +5,6 @@ // Copyright 2001 California Institute of Technology -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ThermoPhase.h" #include "PureFluidPhase.h" #include "mix_defs.h" diff --git a/Cantera/src/transport/AqueousTransport.cpp b/Cantera/src/transport/AqueousTransport.cpp index 56990f62e..2c85bd3a9 100644 --- a/Cantera/src/transport/AqueousTransport.cpp +++ b/Cantera/src/transport/AqueousTransport.cpp @@ -2,11 +2,6 @@ * @file MixTransport.cpp * Mixture-averaged transport properties for ideal gas mixtures. */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif #include "ThermoPhase.h" #include "AqueousTransport.h" @@ -27,12 +22,10 @@ using namespace std; */ #define MIN_X 1.e-20 - namespace Cantera { //////////////////// class AqueousTransport methods ////////////// - AqueousTransport::AqueousTransport() : m_nsp(0), m_tmin(-1.0), @@ -58,11 +51,8 @@ namespace Cantera { m_debug(false), m_nDim(1) { - - } - // Initialize the object /* * This is where we dimension everything. diff --git a/Cantera/src/transport/DustyGasTransport.cpp b/Cantera/src/transport/DustyGasTransport.cpp index 076549f50..dc4d2c338 100644 --- a/Cantera/src/transport/DustyGasTransport.cpp +++ b/Cantera/src/transport/DustyGasTransport.cpp @@ -10,12 +10,6 @@ * See file License.txt for licensing information */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ThermoPhase.h" #include "DustyGasTransport.h" @@ -27,13 +21,10 @@ using namespace std; */ #define MIN_X 1.e-20 - namespace Cantera { - //////////////////// class DustyGasTransport methods ////////////// - DustyGasTransport::DustyGasTransport(thermo_t* thermo) : Transport(thermo), m_temp(-1.0), diff --git a/Cantera/src/transport/L_matrix.h b/Cantera/src/transport/L_matrix.h index 238d68370..aaaa6b287 100755 --- a/Cantera/src/transport/L_matrix.h +++ b/Cantera/src/transport/L_matrix.h @@ -8,19 +8,11 @@ #ifndef CT_LMATRIX_H #define CT_LMATRIX_H -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "DenseMatrix.h" #include "ct_defs.h" #include - - ///////////////////////////////////////////////////////////////////// namespace Cantera { diff --git a/Cantera/src/transport/MMCollisionInt.cpp b/Cantera/src/transport/MMCollisionInt.cpp index 888b86a8f..65cce28a9 100755 --- a/Cantera/src/transport/MMCollisionInt.cpp +++ b/Cantera/src/transport/MMCollisionInt.cpp @@ -3,11 +3,6 @@ */ // Copyright 2001 California Institute of Technology */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "MMCollisionInt.h" #include "utilities.h" #include "polyfit.h" diff --git a/Cantera/src/transport/MMCollisionInt.h b/Cantera/src/transport/MMCollisionInt.h index 5b2d46a89..fe2dd33c0 100755 --- a/Cantera/src/transport/MMCollisionInt.h +++ b/Cantera/src/transport/MMCollisionInt.h @@ -4,21 +4,12 @@ */ // Copyright 2001 California Institute of Technology - #ifndef CT_MMCOLLISIONINT_H #define CT_MMCOLLISIONINT_H #include - - #include "ct_defs.h" -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - namespace Cantera { class XML_Writer; diff --git a/Cantera/src/transport/MixTransport.cpp b/Cantera/src/transport/MixTransport.cpp index 2872d195a..0473984ab 100755 --- a/Cantera/src/transport/MixTransport.cpp +++ b/Cantera/src/transport/MixTransport.cpp @@ -4,13 +4,6 @@ */ // copyright 2001 California Institute of Technology - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ThermoPhase.h" #include "MixTransport.h" diff --git a/Cantera/src/transport/MixTransport.h b/Cantera/src/transport/MixTransport.h index 229c94154..ea4378156 100644 --- a/Cantera/src/transport/MixTransport.h +++ b/Cantera/src/transport/MixTransport.h @@ -4,17 +4,9 @@ */ // Copyright 2001 California Institute of Technology - #ifndef CT_MIXTRAN_H #define CT_MIXTRAN_H - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - // STL includes #include #include diff --git a/Cantera/src/transport/MultiTransport.cpp b/Cantera/src/transport/MultiTransport.cpp index 3f2c5953b..b272c35cd 100755 --- a/Cantera/src/transport/MultiTransport.cpp +++ b/Cantera/src/transport/MultiTransport.cpp @@ -10,12 +10,6 @@ * See file License.txt for licensing information */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ThermoPhase.h" #include "MultiTransport.h" diff --git a/Cantera/src/transport/MultiTransport.h b/Cantera/src/transport/MultiTransport.h index 5979b8ce9..6cd1e9f4e 100644 --- a/Cantera/src/transport/MultiTransport.h +++ b/Cantera/src/transport/MultiTransport.h @@ -7,31 +7,19 @@ // Copyright 2001 California Institute of Technology - #ifndef CT_MULTITRAN_H #define CT_MULTITRAN_H - // Define this for better agreement with Chemkin TRANLIB results, even // if the results are less correct. //#undef CHEMKIN_COMPATIBILITY_MODE - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - - // Cantera includes #include "TransportBase.h" #include "DenseMatrix.h" - namespace Cantera { - //! Transport solve options enum TRANSOLVE_TYPE { //! Solve the dense matrix via a gmres iteration diff --git a/Cantera/src/transport/SolidTransport.cpp b/Cantera/src/transport/SolidTransport.cpp index a75839f08..21a22681b 100644 --- a/Cantera/src/transport/SolidTransport.cpp +++ b/Cantera/src/transport/SolidTransport.cpp @@ -4,13 +4,6 @@ */ // copyright 2008 California Institute of Technology - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ThermoPhase.h" #include "SolidTransport.h" diff --git a/Cantera/src/transport/SolidTransport.h b/Cantera/src/transport/SolidTransport.h index cc5ad4989..7f89f5cfa 100644 --- a/Cantera/src/transport/SolidTransport.h +++ b/Cantera/src/transport/SolidTransport.h @@ -5,17 +5,9 @@ */ // Copyright 2003 California Institute of Technology - #ifndef CT_SOLIDTRAN_H #define CT_SOLIDTRAN_H - -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - // STL includes #include #include @@ -23,14 +15,11 @@ #include #include - // Cantera includes #include "TransportBase.h" #include "DenseMatrix.h" namespace Cantera { - - /** * Class SolidTransport implements transport * properties for solids. diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp index 3fce58ea3..cda0cdaf4 100644 --- a/Cantera/src/transport/TransportFactory.cpp +++ b/Cantera/src/transport/TransportFactory.cpp @@ -1,18 +1,9 @@ /** - * * @file TransportFactory.cpp * * Implementation file for class TransportFactory. - * - * */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ThermoPhase.h" // known transport models diff --git a/Cantera/src/transport/TransportFactory.h b/Cantera/src/transport/TransportFactory.h index 82af912f3..5a6e35ea5 100644 --- a/Cantera/src/transport/TransportFactory.h +++ b/Cantera/src/transport/TransportFactory.h @@ -8,12 +8,6 @@ #ifndef CT_TRANFACTORY_H #define CT_TRANFACTORY_H -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - // STL includes #include #include diff --git a/Cantera/src/zeroD/ConstPressureReactor.cpp b/Cantera/src/zeroD/ConstPressureReactor.cpp index 7ffb441bf..bd2c2fd9b 100644 --- a/Cantera/src/zeroD/ConstPressureReactor.cpp +++ b/Cantera/src/zeroD/ConstPressureReactor.cpp @@ -6,12 +6,6 @@ // Copyright 2001 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ConstPressureReactor.h" #include "FlowDevice.h" #include "Wall.h" diff --git a/Cantera/src/zeroD/ConstPressureReactor.h b/Cantera/src/zeroD/ConstPressureReactor.h index a0ee4030e..ce0c92a35 100644 --- a/Cantera/src/zeroD/ConstPressureReactor.h +++ b/Cantera/src/zeroD/ConstPressureReactor.h @@ -7,11 +7,6 @@ #ifndef CT_CONSTP_REACTOR_H #define CT_CONSTP_REACTOR_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "Reactor.h" namespace CanteraZeroD { diff --git a/Cantera/src/zeroD/FlowDevice.h b/Cantera/src/zeroD/FlowDevice.h index f74ee247d..5ab10f00c 100644 --- a/Cantera/src/zeroD/FlowDevice.h +++ b/Cantera/src/zeroD/FlowDevice.h @@ -7,11 +7,6 @@ #ifndef CT_FLOWDEVICE_H #define CT_FLOWDEVICE_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "global.h" #include "stringUtils.h" diff --git a/Cantera/src/zeroD/FlowReactor.cpp b/Cantera/src/zeroD/FlowReactor.cpp index 2234da45b..66bf62578 100644 --- a/Cantera/src/zeroD/FlowReactor.cpp +++ b/Cantera/src/zeroD/FlowReactor.cpp @@ -6,12 +6,6 @@ // Copyright 2001 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "FlowReactor.h" using namespace Cantera; @@ -19,7 +13,6 @@ using namespace std; namespace CanteraZeroD { - FlowReactor::FlowReactor() : Reactor(), m_fctr(1.0e10), m_speed0(0.0) {} diff --git a/Cantera/src/zeroD/FlowReactor.h b/Cantera/src/zeroD/FlowReactor.h index 49be29905..15f74f361 100644 --- a/Cantera/src/zeroD/FlowReactor.h +++ b/Cantera/src/zeroD/FlowReactor.h @@ -7,11 +7,6 @@ #ifndef CT_FLOWREACTOR_H #define CT_FLOWREACTOR_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "Reactor.h" namespace CanteraZeroD { diff --git a/Cantera/src/zeroD/PID_Controller.h b/Cantera/src/zeroD/PID_Controller.h index cd3ec7c13..01a853c4b 100644 --- a/Cantera/src/zeroD/PID_Controller.h +++ b/Cantera/src/zeroD/PID_Controller.h @@ -7,14 +7,8 @@ #ifndef CT_PID_H #define CT_PID_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - namespace CanteraZeroD { - class PID_Controller { public: diff --git a/Cantera/src/zeroD/Reactor.cpp b/Cantera/src/zeroD/Reactor.cpp index d8eadc4da..ebcd51795 100644 --- a/Cantera/src/zeroD/Reactor.cpp +++ b/Cantera/src/zeroD/Reactor.cpp @@ -6,12 +6,6 @@ // Copyright 2001 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "Reactor.h" //#include "../CVode.h" #include "FlowDevice.h" diff --git a/Cantera/src/zeroD/Reactor.h b/Cantera/src/zeroD/Reactor.h index 8e044e1bf..ae3c33e36 100644 --- a/Cantera/src/zeroD/Reactor.h +++ b/Cantera/src/zeroD/Reactor.h @@ -7,15 +7,9 @@ #ifndef CT_REACTOR_H #define CT_REACTOR_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ReactorBase.h" #include "Kinetics.h" - namespace CanteraZeroD { /** diff --git a/Cantera/src/zeroD/ReactorBase.cpp b/Cantera/src/zeroD/ReactorBase.cpp index a0077488c..45e33976f 100644 --- a/Cantera/src/zeroD/ReactorBase.cpp +++ b/Cantera/src/zeroD/ReactorBase.cpp @@ -4,11 +4,6 @@ // Copyright 2001 California Institute of Technology -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ReactorBase.h" #include "FlowDevice.h" #include "Wall.h" diff --git a/Cantera/src/zeroD/ReactorBase.h b/Cantera/src/zeroD/ReactorBase.h index 2e39999ec..b1ab2d43a 100644 --- a/Cantera/src/zeroD/ReactorBase.h +++ b/Cantera/src/zeroD/ReactorBase.h @@ -6,11 +6,6 @@ #ifndef CT_REACTORBASE_H #define CT_REACTORBASE_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ThermoPhase.h" using namespace Cantera; diff --git a/Cantera/src/zeroD/ReactorFactory.cpp b/Cantera/src/zeroD/ReactorFactory.cpp index ff8d0a2f9..360a2ab32 100644 --- a/Cantera/src/zeroD/ReactorFactory.cpp +++ b/Cantera/src/zeroD/ReactorFactory.cpp @@ -3,11 +3,6 @@ */ // Copyright 2006 California Institute of Technology - -#ifdef WIN32 -#pragma warning(disable:4786) -#endif - #include "ReactorFactory.h" #include "Reservoir.h" diff --git a/Cantera/src/zeroD/ReactorNet.h b/Cantera/src/zeroD/ReactorNet.h index bad52e761..9c57842cb 100644 --- a/Cantera/src/zeroD/ReactorNet.h +++ b/Cantera/src/zeroD/ReactorNet.h @@ -6,11 +6,6 @@ #ifndef CT_REACTORNET_H #define CT_REACTORNET_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "Reactor.h" #include "FuncEval.h" #include "Integrator.h" @@ -18,7 +13,6 @@ namespace CanteraZeroD { - class ReactorNet : public Cantera::FuncEval { public: diff --git a/Cantera/src/zeroD/Reservoir.h b/Cantera/src/zeroD/Reservoir.h index 130f09509..f66439bfa 100644 --- a/Cantera/src/zeroD/Reservoir.h +++ b/Cantera/src/zeroD/Reservoir.h @@ -6,11 +6,6 @@ #ifndef CT_RESERVOIR_H #define CT_RESERVOIR_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include "ReactorBase.h" diff --git a/Cantera/src/zeroD/Wall.h b/Cantera/src/zeroD/Wall.h index 01247205a..79097ed5a 100644 --- a/Cantera/src/zeroD/Wall.h +++ b/Cantera/src/zeroD/Wall.h @@ -4,15 +4,9 @@ */ // Copyright 2001-2004 California Institute of Technology - #ifndef CT_WALL_H #define CT_WALL_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "ct_defs.h" #include "ctexceptions.h" #include "Func1.h" diff --git a/Cantera/src/zeroD/flowControllers.h b/Cantera/src/zeroD/flowControllers.h index 5eead2ff2..8c3d4fcfd 100644 --- a/Cantera/src/zeroD/flowControllers.h +++ b/Cantera/src/zeroD/flowControllers.h @@ -9,19 +9,12 @@ #ifndef CT_FLOWCONTR_H #define CT_FLOWCONTR_H -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include "FlowDevice.h" #include "ReactorBase.h" //#include "PID_Controller.h" #include "Func1.h" namespace CanteraZeroD { - - /** * A class for mass flow controllers. The mass flow rate is constant, * independent of any other parameters. diff --git a/apps/bvp/stagnation.cpp b/apps/bvp/stagnation.cpp index 1638fe2d0..e000d23b1 100644 --- a/apps/bvp/stagnation.cpp +++ b/apps/bvp/stagnation.cpp @@ -4,13 +4,6 @@ // Copyright 2002 California Institute of Technology -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#pragma warning(disable:4267) -#endif - #include #include diff --git a/ext/f2c_libs/dtime_.c b/ext/f2c_libs/dtime_.c index 2335a27ae..6a09b3e98 100644 --- a/ext/f2c_libs/dtime_.c +++ b/ext/f2c_libs/dtime_.c @@ -1,9 +1,5 @@ #include "time.h" -#ifdef WIN32 -#pragma warning(disable:4244) -#endif - #ifdef MSDOS #undef USE_CLOCK #define USE_CLOCK diff --git a/ext/f2c_libs/etime_.c b/ext/f2c_libs/etime_.c index ba67ffde8..2d9a36d8a 100644 --- a/ext/f2c_libs/etime_.c +++ b/ext/f2c_libs/etime_.c @@ -1,9 +1,5 @@ #include "time.h" -#ifdef WIN32 -#pragma warning(disable:4244) -#endif - #ifdef MSDOS #undef USE_CLOCK #define USE_CLOCK diff --git a/ext/f2c_libs/f2c.h b/ext/f2c_libs/f2c.h index 6ddb51b30..af75d6d1f 100644 --- a/ext/f2c_libs/f2c.h +++ b/ext/f2c_libs/f2c.h @@ -18,11 +18,6 @@ #define _COMPLEX_DEFINED typedef __int64 longint; typedef __int64 ulongint; /* HACK ALERT */ -// warning C4244: 'xoperx' : conversion from 'xxx ' to 'xxx ', possible loss of data -// warning C4101: 'xxx' : unreferenced local variable -#pragma warning(disable:4244) -#pragma warning(disable:4101) -#pragma warning(disable:4554) #endif //typedef long int integer; diff --git a/ext/f2c_libs/f2c.h0 b/ext/f2c_libs/f2c.h0 index 1f78d120c..af75d6d1f 100644 --- a/ext/f2c_libs/f2c.h0 +++ b/ext/f2c_libs/f2c.h0 @@ -18,10 +18,6 @@ #define _COMPLEX_DEFINED typedef __int64 longint; typedef __int64 ulongint; /* HACK ALERT */ -// warning C4244: 'xoperx' : conversion from 'xxx ' to 'xxx ', possible loss of data -// warning C4101: 'xxx' : unreferenced local variable -#pragma warning(disable:4244) -#pragma warning(disable:4101) #endif //typedef long int integer; diff --git a/test_problems/cxx_ex/equil_example1.cpp b/test_problems/cxx_ex/equil_example1.cpp index 3cd4be322..d2873a55e 100755 --- a/test_problems/cxx_ex/equil_example1.cpp +++ b/test_problems/cxx_ex/equil_example1.cpp @@ -5,12 +5,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include "example_utils.h" #include diff --git a/test_problems/cxx_ex/examples.cpp b/test_problems/cxx_ex/examples.cpp index b4f7c8c7e..6e2034b24 100755 --- a/test_problems/cxx_ex/examples.cpp +++ b/test_problems/cxx_ex/examples.cpp @@ -1,16 +1,9 @@ - #include using namespace Cantera; using namespace std; //#include "ctexceptions.h" -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #define NUM_EXAMPLES 6 int kinetics_example1(int job); diff --git a/test_problems/cxx_ex/kinetics_example1.cpp b/test_problems/cxx_ex/kinetics_example1.cpp index c38022a98..3d3cd839b 100755 --- a/test_problems/cxx_ex/kinetics_example1.cpp +++ b/test_problems/cxx_ex/kinetics_example1.cpp @@ -6,12 +6,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include diff --git a/test_problems/cxx_ex/kinetics_example2.cpp b/test_problems/cxx_ex/kinetics_example2.cpp index 18289595a..d3758e5be 100755 --- a/test_problems/cxx_ex/kinetics_example2.cpp +++ b/test_problems/cxx_ex/kinetics_example2.cpp @@ -6,12 +6,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include diff --git a/test_problems/cxx_ex/kinetics_example3.cpp b/test_problems/cxx_ex/kinetics_example3.cpp index b1b9999af..a32a1bc1d 100644 --- a/test_problems/cxx_ex/kinetics_example3.cpp +++ b/test_problems/cxx_ex/kinetics_example3.cpp @@ -6,12 +6,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include diff --git a/test_problems/cxx_ex/rxnpath_example1.cpp b/test_problems/cxx_ex/rxnpath_example1.cpp index 6654e9da4..3d0407aa7 100755 --- a/test_problems/cxx_ex/rxnpath_example1.cpp +++ b/test_problems/cxx_ex/rxnpath_example1.cpp @@ -6,12 +6,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include "example_utils.h" diff --git a/test_problems/cxx_ex/transport_example1.cpp b/test_problems/cxx_ex/transport_example1.cpp index 169d0181b..e09e5c559 100755 --- a/test_problems/cxx_ex/transport_example1.cpp +++ b/test_problems/cxx_ex/transport_example1.cpp @@ -6,12 +6,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include "example_utils.h" diff --git a/test_problems/cxx_ex/transport_example2.cpp b/test_problems/cxx_ex/transport_example2.cpp index 7daa8df81..0b95fc1b0 100755 --- a/test_problems/cxx_ex/transport_example2.cpp +++ b/test_problems/cxx_ex/transport_example2.cpp @@ -6,12 +6,6 @@ // ///////////////////////////////////////////////////////////// -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include #include "example_utils.h" diff --git a/tools/src/ck2cti.cpp b/tools/src/ck2cti.cpp index b53f1bc3b..d77a0f168 100644 --- a/tools/src/ck2cti.cpp +++ b/tools/src/ck2cti.cpp @@ -30,11 +30,6 @@ * input file name without the extension. Since only one phase definition * is present in the ck2cti output, this parameter is not required. */ -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - #include #include using namespace std; diff --git a/tools/templates/f77/demo_ftnlib.cpp b/tools/templates/f77/demo_ftnlib.cpp index 2baa9bf06..b31204f2a 100644 --- a/tools/templates/f77/demo_ftnlib.cpp +++ b/tools/templates/f77/demo_ftnlib.cpp @@ -25,12 +25,6 @@ */ -// turn off warnings under Windows -#ifdef WIN32 -#pragma warning(disable:4786) -#pragma warning(disable:4503) -#endif - // add any other Cantera header files you need here #include #include diff --git a/tools/testtools/csvdiff.cpp b/tools/testtools/csvdiff.cpp index 77c6f47fa..81e2da83f 100644 --- a/tools/testtools/csvdiff.cpp +++ b/tools/testtools/csvdiff.cpp @@ -46,9 +46,6 @@ using namespace std; # define TRUE 1 # define FALSE 0 #endif -#ifdef WIN32 -#pragma warning(disable:4996) -#endif #ifndef MAX # define MAX(x,y) (( (x) > (y) ) ? (x) : (y)) #endif diff --git a/tools/testtools/mdp_allo.cpp b/tools/testtools/mdp_allo.cpp index 32093ec07..45bdd3b40 100644 --- a/tools/testtools/mdp_allo.cpp +++ b/tools/testtools/mdp_allo.cpp @@ -7,10 +7,6 @@ #include "mdp_allo.h" -#ifdef WIN32 -#pragma warning(disable:4996) -#endif - /* * Allocate global storage for 2 debugging ints that are used in IO of * error information. diff --git a/tools/testtools/tok_input_util.cpp b/tools/testtools/tok_input_util.cpp index a33978d3a..c3c67908c 100644 --- a/tools/testtools/tok_input_util.cpp +++ b/tools/testtools/tok_input_util.cpp @@ -1,7 +1,3 @@ -#ifdef WIN32 -#pragma warning(disable:4996) -#endif - #include #include #include