Add move semantics to Variant

[libs/core.git] / source / fs / path.h

diff --git a/source/fs/path.h b/source/fs/path.h
index 3cbfb16cf6e4052c57d223cd1fafd96b377b1c98..1b15047cc528ece01f9d2061fcd0fd3740dedfef 100644 (file)
--- a/source/fs/path.h
+++ b/source/fs/path.h
@@ -4,13 +4,14 @@
 #include <ostream>
 #include <string>
 #include <vector>
+#include <msp/core/mspcore_api.h>
 
 namespace Msp {
 namespace FS {
 
 enum
 {
-#ifdef WIN32
+#ifdef _WIN32
        DIRSEP = '\\'
 #else
        DIRSEP = '/'
@@ -28,13 +29,13 @@ A path can also be treated as an array of components, supporting indexing,
 iteration and slicing.  In this context the root directory is treated as a
 component of its own.
 */
-class Path
+class MSPCORE_API Path
 {
 private:
        typedef std::vector<std::string::size_type> PositionArray;
 
 public:
-       class Iterator
+       class MSPCORE_API Iterator
        {
        public:
                typedef PositionArray::difference_type difference_type;
@@ -67,16 +68,13 @@ public:
 
 private:
        std::string path;
-       std::vector<std::string::size_type> separators;
+       PositionArray separators;
 
 public:
-       Path();
+       Path() = default;
        Path(const std::string &);
-       Path(const char *);
-private:
-       void init(const std::string &);
+       Path(const char *p): Path(std::string(p)) { }
 
-public:
        /// Returns the path as a string.
        const std::string &str() const { return path; }