Move accessors of static data members to .cpp files

Importing data items directly is tricky on MSVC, so better to hide them
behind functions.

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 1b77a7c11273daadcf5c080fa77c369fe57ed65f..c214a06316598b54ed59403493df366a60ca568f 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -118,6 +118,21 @@ void Application::set_startup_info(const char *argv0, void *data)
        _data = data;
 }
 
+void *Application::get_data()
+{
+       return _data;
+}
+
+const char *Application::get_argv0()
+{
+       return _argv0;
+}
+
+const std::string &Application::get_name()
+{
+       return _name;
+}
+
 int Application::main()
 {
        done = false;

diff --git a/source/core/application.h b/source/core/application.h
index 2a1cc05b1cc8b5d9b8a37cf6f061c782df43e8da..d5a571a28a9f73306dffae3e99b470e39a2fcb47 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -54,9 +54,9 @@ public:
        Application::run(). */
        static void set_startup_info(const char *, void *);
 
-       static void *get_data() { return _data; }
-       static const char *get_argv0() { return _argv0; }
-       static const std::string &get_name() { return _name; }
+       static void *get_data();
+       static const char *get_argv0();
+       static const std::string &get_name();
 
 protected:
        /** Default main loop.  Calls tick() repeatedly until exit() is called.  A

diff --git a/source/debug/errorreporter.cpp b/source/debug/errorreporter.cpp
index edfa0026d58a6b92c08f43c5138a3ccc4aca610f..6591c037ac68da524a76b740779c35549e5f7114 100644 (file)
--- a/source/debug/errorreporter.cpp
+++ b/source/debug/errorreporter.cpp
@@ -16,5 +16,10 @@ ErrorReporter::~ErrorReporter()
        _current = _prev;
 }
 
+const ErrorReporter *ErrorReporter::get_current()
+{
+       return _current;
+}
+
 } // namespace Debug
 } // namespace Msp

diff --git a/source/debug/errorreporter.h b/source/debug/errorreporter.h
index ce14c637a1d74d5870e5fa2708a58ce85c940497..b702b7cfb10138a92e07c709b6058999f841481d 100644 (file)
--- a/source/debug/errorreporter.h
+++ b/source/debug/errorreporter.h
@@ -20,7 +20,7 @@ protected:
 public:
        virtual ~ErrorReporter();
 
-       static const ErrorReporter *get_current() { return _current; }
+       static const ErrorReporter *get_current();
 
        virtual bool report_uncaught_exception(const std::exception &) const = 0;
 };