From 1590d5fe4f95a800635ba9078e822d742a96dc18 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 11 Aug 2011 10:54:21 +0200 Subject: Don't export methods on already exported classes. This is always a mistake. --- .../lib_shared_and_static/libshared_and_static.h | 4 ---- Tests/Module/GenerateExportHeader/libshared/libshared.h | 5 ----- Tests/Module/GenerateExportHeader/libstatic/libstatic.h | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h index 400d664..049bfe9 100644 --- a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h +++ b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h @@ -8,11 +8,7 @@ class LIBSHARED_AND_STATIC_EXPORT LibsharedAndStatic { public: int libshared_and_static() const; -#ifdef COMPILER_IS_MSVC int libshared_and_static_exported() const; -#else - int LIBSHARED_AND_STATIC_EXPORT libshared_and_static_exported() const; -#endif int LIBSHARED_AND_STATIC_DEPRECATED libshared_and_static_deprecated() const; diff --git a/Tests/Module/GenerateExportHeader/libshared/libshared.h b/Tests/Module/GenerateExportHeader/libshared/libshared.h index 280e185..3d9bbff 100644 --- a/Tests/Module/GenerateExportHeader/libshared/libshared.h +++ b/Tests/Module/GenerateExportHeader/libshared/libshared.h @@ -8,12 +8,7 @@ class LIBSHARED_EXPORT Libshared { public: int libshared() const; -#ifdef COMPILER_IS_MSVC - // Double exporting not possible with MSVC int libshared_exported() const; -#else - int LIBSHARED_EXPORT libshared_exported() const; -#endif int LIBSHARED_DEPRECATED libshared_deprecated() const; diff --git a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h b/Tests/Module/GenerateExportHeader/libstatic/libstatic.h index cd68cdc..cc7a35b 100644 --- a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h +++ b/Tests/Module/GenerateExportHeader/libstatic/libstatic.h @@ -8,7 +8,7 @@ class LIBSTATIC_EXPORT Libstatic { public: int libstatic() const; - int LIBSTATIC_EXPORT libstatic_exported() const; + int libstatic_exported() const; int LIBSTATIC_DEPRECATED libstatic_deprecated() const; -- cgit v0.12