1 files changed, 52 insertions, 23 deletions

diff --git a/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h b/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
index 6072d9b..1017e12 100644
--- a/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
+++ b/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
@@ -1,57 +1,86 @@
-
 #ifndef LIBSTATIC_H
 #define LIBSTATIC_H
 
 #include "libstatic_export.h"
 
-class LIBSTATIC_EXPORT Libstatic
+namespace libstatic {
+
+class Class
 {
 public:
-  int libstatic() const;
+  int method() const;
+
+  int LIBSTATIC_EXPORT method_exported() const;
+
+  int LIBSTATIC_DEPRECATED method_deprecated() const;
 
-  int libstatic_exported() const;
+  int LIBSTATIC_DEPRECATED_EXPORT method_deprecated_exported() const;
 
-  int LIBSTATIC_DEPRECATED libstatic_deprecated() const;
+  int LIBSTATIC_NO_EXPORT method_excluded() const;
 
-  int libstatic_not_exported() const;
+  static int const data;
 
-  int LIBSTATIC_NO_EXPORT libstatic_excluded() const;
+  static int const LIBSTATIC_EXPORT data_exported;
+
+  static int const LIBSTATIC_NO_EXPORT data_excluded;
 };
 
-class LibstaticNotExported
+class LIBSTATIC_EXPORT ExportedClass
 {
 public:
-  int libstatic() const;
+  int method() const;
+
+  int LIBSTATIC_EXPORT method_exported() const;
+
+  int LIBSTATIC_DEPRECATED method_deprecated() const;
+
+  int LIBSTATIC_DEPRECATED_EXPORT method_deprecated_exported() const;
 
-  int LIBSTATIC_EXPORT libstatic_exported() const;
+  int LIBSTATIC_NO_EXPORT method_excluded() const;
 
-  int LIBSTATIC_DEPRECATED libstatic_deprecated() const;
+  static int const data;
 
-  int libstatic_not_exported() const;
+  static int const LIBSTATIC_EXPORT data_exported;
 
-  int LIBSTATIC_NO_EXPORT libstatic_excluded() const;
+  static int const LIBSTATIC_NO_EXPORT data_excluded;
 };
 
-class LIBSTATIC_NO_EXPORT LibstaticExcluded
+class LIBSTATIC_NO_EXPORT ExcludedClass
 {
 public:
-  int libstatic() const;
+  int method() const;
 
-  int LIBSTATIC_EXPORT libstatic_exported() const;
+  int LIBSTATIC_EXPORT method_exported() const;
 
-  int LIBSTATIC_DEPRECATED libstatic_deprecated() const;
+  int LIBSTATIC_DEPRECATED method_deprecated() const;
 
-  int libstatic_not_exported() const;
+  int LIBSTATIC_DEPRECATED_EXPORT method_deprecated_exported() const;
 
-  int LIBSTATIC_NO_EXPORT libstatic_excluded() const;
+  int LIBSTATIC_NO_EXPORT method_excluded() const;
+
+  static int const data;
+
+  static int const LIBSTATIC_EXPORT data_exported;
+
+  static int const LIBSTATIC_NO_EXPORT data_excluded;
 };
 
-LIBSTATIC_EXPORT int libstatic_exported();
+int function();
+
+int LIBSTATIC_EXPORT function_exported();
+
+int LIBSTATIC_DEPRECATED function_deprecated();
+
+int LIBSTATIC_DEPRECATED_EXPORT function_deprecated_exported();
+
+int LIBSTATIC_NO_EXPORT function_excluded();
+
+extern int const data;
 
-LIBSTATIC_DEPRECATED_EXPORT int libstatic_deprecated();
+extern int const LIBSTATIC_EXPORT data_exported;
 
-int libstatic_not_exported();
+extern int const LIBSTATIC_NO_EXPORT data_excluded;
 
-int LIBSTATIC_NO_EXPORT libstatic_excluded();
+} // namespace libstatic
 
 #endif