Add move semantics to Variant

[libs/core.git] / source / core / application.h

diff --git a/source/core/application.h b/source/core/application.h
index c3c693d3052a2fb9808bc3018cdecd40218102d2..d5a571a28a9f73306dffae3e99b470e39a2fcb47 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -3,6 +3,7 @@
 
 #include <stdexcept>
 #include <string>
+#include "mspcore_api.h"
 #include "noncopyable.h"
 
 namespace Msp {
@@ -10,10 +11,10 @@ namespace Msp {
 /**
 Base class for applications.  See also RegisteredApplication.
 */
-class Application: private NonCopyable
+class MSPCORE_API Application: private NonCopyable
 {
 protected:
-       class Starter
+       class MSPCORE_API Starter
        {
        protected:
                Starter();
@@ -44,7 +45,7 @@ public:
 
        This function can only be called once.  The global main() function provided
        by the library normally does it automatically at program startup. */
-       static int run(int, char **, void * = 0, void (*)(void *) = 0);
+       static int run(int, char **, void * = nullptr, void (*)(void *) = nullptr);
 
        /** Sets application startup info, including argv[0] value and platform-
        specific data.
@@ -53,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