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

Remove the DEPRECATED macro

Browse source 
This macro was not a reliable way of marking deprecated features. Future
deprecation warnings will be issued at runtime using the warn_deprecated
function.
This commit is contained in:
Ray Speth 2013-05-31 15:56:11 +00:00
parent c1cfdffccc
commit f8ac8ea7c3
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -204,12 +204,12 @@ if env['CC'] == 'gcc' or env['CC'] == 'llvm-gcc':
defaults.debugCcFlags = '-g'
defaults.noOptimizeCcFlags = '-O0 -fno-inline'
defaults.optimizeCcFlags = '-O3 -DNDEBUG -finline-functions -Wno-inline'
defaults.warningFlags = '-Wall -Wno-deprecated-declarations'
defaults.warningFlags = '-Wall'
elif env['CC'] == 'cl': # Visual Studio
defaults.cxxFlags = '/EHsc'
defaults.ccFlags = ' '.join(['/MD', '/nologo', '/Zc:wchar_t', '/Zc:forScope',
'/D_SCL_SECURE_NO_WARNINGS', '/D_CRT_SECURE_NO_WARNINGS', '/wd4996'])
'/D_SCL_SECURE_NO_WARNINGS', '/D_CRT_SECURE_NO_WARNINGS'])
defaults.debugCcFlags = '/Zi /Fd${TARGET}.pdb'
defaults.noOptimizeCcFlags = '/Od /Ob0'
defaults.optimizeCcFlags = '/O2 /DNDEBUG'
@ -226,7 +226,7 @@ elif env['CC'] == 'icc':
elif env['CC'] == 'clang':
defaults.cxxFlags = ''
defaults.ccFlags = '-fcolor-diagnostics -Wno-deprecated-declarations'
defaults.ccFlags = '-fcolor-diagnostics'
defaults.debugCcFlags = '-g'
defaults.noOptimizeCcFlags = '-O0'
defaults.optimizeCcFlags = '-O3 -DNDEBUG'
@ -235,9 +235,6 @@ elif env['CC'] == 'clang':
else:
print "WARNING: Unrecognized C compiler '%s'" % env['CC']
# TODO: Once deprecated functions have been removed, remove the
# compiler options: -Wno-deprecated-declarations and /wd4996
if env['OS'] in ('Windows', 'Darwin'):
defaults.threadFlags = ''
defaults.singleLibrary = True

10
include/cantera/base/ct_defs.h
View file

@ -24,16 +24,6 @@
#include <map>
#include <string>
// Warn about deprecated functions at compile time
#ifdef __GNUC__
#define DEPRECATED(func) func __attribute__ ((deprecated))
#elif defined(_MSC_VER)
#define DEPRECATED(func) __declspec(deprecated) func
#else
#pragma message("WARNING: You need to implement DEPRECATED for this compiler")
#define DEPRECATED(func) func
#endif
/**
* Namespace for the Cantera kernel.
*/