summaryrefslogtreecommitdiffstats
path: root/Tests/Module
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2011-08-11 08:54:21 (GMT)
committerStephen Kelly <steveire@gmail.com>2011-08-11 08:55:12 (GMT)
commit1590d5fe4f95a800635ba9078e822d742a96dc18 (patch)
tree8dec154a33c2c288b030359400d37843d9fbf158 /Tests/Module
parent750b67c5a1957f5fa2c7a483050f0ef0959c9924 (diff)
downloadCMake-1590d5fe4f95a800635ba9078e822d742a96dc18.zip
CMake-1590d5fe4f95a800635ba9078e822d742a96dc18.tar.gz
CMake-1590d5fe4f95a800635ba9078e822d742a96dc18.tar.bz2
Don't export methods on already exported classes.
This is always a mistake.
Diffstat (limited to 'Tests/Module')
-rw-r--r--Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h4
-rw-r--r--Tests/Module/GenerateExportHeader/libshared/libshared.h5
-rw-r--r--Tests/Module/GenerateExportHeader/libstatic/libstatic.h2
3 files changed, 1 insertions, 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;