Add move semantics to Variant

[libs/core.git] / source / io / console.h

diff --git a/source/io/console.h b/source/io/console.h
index 8feccfd2ffe74a2fd3e1e05d69310e887eb7c0d6..fe777cc04db02e90b88df52730c5f41ec3af513d 100644 (file)
--- a/source/io/console.h
+++ b/source/io/console.h
@@ -1,6 +1,7 @@
 #ifndef MSP_IO_CONSOLE_H_
 #define MSP_IO_CONSOLE_H_
 
+#include <msp/core/mspcore_api.h>
 #include "eventobject.h"
 #include "handle.h"
 
@@ -12,7 +13,7 @@ Provides access to standard input, output and error streams.  This class can't
 be instantiated directly - use one of the cin, cout and cerr references
 instead.
 */
-class Console: public EventObject
+class MSPCORE_API Console: public EventObject
 {
 public:
        enum Stream
@@ -31,8 +32,8 @@ private:
 public:
        ~Console();
 
-       virtual void set_block(bool);
-       virtual void set_inherit(bool);
+       void set_block(bool) override;
+       void set_inherit(bool) override;
        
        /** If local echo is enabled, characters will appear on the console as they
        are typed.  Can only be used on an input Console.  */
@@ -54,19 +55,20 @@ public:
        void redirect(Base &);
 
 protected:
-       virtual unsigned do_write(const char *, unsigned);
-       virtual unsigned do_read(char *, unsigned);
+       std::size_t do_write(const char *, std::size_t) override;
+       std::size_t do_read(char *, std::size_t) override;
 
 public:
-       virtual const Handle &get_handle(Mode);
-       virtual const Handle &get_event_handle() { return handle; }
+       const Handle &get_handle(Mode) override;
+       const Handle &get_event_handle() override { return handle; }
 
        static Console &instance(Stream);
 };
 
-extern Console &cin;
-extern Console &cout;
-extern Console &cerr;
+// TODO make these inline instead of static when upgrading to C++17.
+static Console &cin = Console::instance(Console::CIN);
+static Console &cout = Console::instance(Console::COUT);
+static Console &cerr = Console::instance(Console::CERR);
 
 } // namespace IO
 } // namespace Msp