mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022)

Browse Source 
Previously we allowed this definition to persist outside our header.
This would cause conflicts across multiple such headers because the name
was always the same.  Fix this by avoiding the definition altogether.
This commit is contained in:
Andreas Schuh
2016-03-17 11:02:26 +00:00
committed by Brad King
parent bf0712866f
commit be5a8973c3
16 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h
View File

@@ -33,9 +33,10 @@
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
#endif
#define DEFINE_NO_DEPRECATED 0
#if DEFINE_NO_DEPRECATED
# define LIBSHARED_NO_DEPRECATED
#if 0 /* DEFINE_NO_DEPRECATED */
# ifndef LIBSHARED_NO_DEPRECATED
# define LIBSHARED_NO_DEPRECATED
# endif
#endif
#endif

7
Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h
View File

@@ -33,9 +33,10 @@
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
#endif
#define DEFINE_NO_DEPRECATED 0
#if DEFINE_NO_DEPRECATED
# define LIBSTATIC_NO_DEPRECATED
#if 0 /* DEFINE_NO_DEPRECATED */
# ifndef LIBSTATIC_NO_DEPRECATED
# define LIBSTATIC_NO_DEPRECATED
# endif
#endif
#endif