From a7df3b6a2e930369904f831f6db9f94c7356efa9 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sun, 27 Sep 2020 17:44:34 -0700 Subject: [PATCH] core: Add NS_DEPRECATED_3_32 tag --- src/core/model/deprecated.h | 9 +++++++++ src/wscript | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/core/model/deprecated.h b/src/core/model/deprecated.h index 4f5b66cd3..3a281d16f 100644 --- a/src/core/model/deprecated.h +++ b/src/core/model/deprecated.h @@ -62,6 +62,15 @@ #define NS_DEPRECATED #endif +/** + * \ingroup core + * \def NS_DEPRECATED_3_32 + * Tag for things deprecated in version ns-3.32. + */ +#ifdef NS_DEPRECATED +#define NS_DEPRECATED_3_32 NS_DEPRECATED +#endif + /** * \ingroup core * \def NS_DEPRECATED_3_31 diff --git a/src/wscript b/src/wscript index 7ad081276..d0b38d720 100644 --- a/src/wscript +++ b/src/wscript @@ -278,10 +278,9 @@ def ns3_python_bindings(bld): pymod.env.append_value('LINKFLAGS', '-Wl,-Bdynamic,--no-whole-archive') defines = list(pymod.env['DEFINES']) defines.extend(['NS_DEPRECATED=', 'NS3_DEPRECATED_H']) + defines.extend(['NS_DEPRECATED_3_32=', 'NS3_DEPRECATED_H']) defines.extend(['NS_DEPRECATED_3_31=', 'NS3_DEPRECATED_H']) defines.extend(['NS_DEPRECATED_3_30=', 'NS3_DEPRECATED_H']) - defines.extend(['NS_DEPRECATED_3_27=', 'NS3_DEPRECATED_H']) - defines.extend(['NS_DEPRECATED_3_26=', 'NS3_DEPRECATED_H']) if Utils.unversioned_sys_platform()== 'win32': try: defines.remove('_DEBUG') # causes undefined symbols on win32