Changeset 816 in dev for branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Source.h

Timestamp:

Mar 19, 2011, 9:13:12 PM (13 years ago)

Author:

イグトランス (egtra)

Message:

ab_commonにおいて、各クラスのコピー禁止を明確化、ならびにコピー可能なものにムーブコンストラクタ・ムーブ代入演算子を追加

File:

• branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Source.h (modified) (3 diffs)

branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Source.h

@@ -103 +103 @@
         text.buffer = static_cast<char*>(calloc(1, 1));
         text.length = 0;
+    }
+    Text& operator =(Text&& y)
+    {
+        SwapImpl(*this, y);
+        return *this;
+    }
+    Text& operator =(Text const& y)
+    {
+        return *this = std::move(Text(y));
     }
     ~Text(){
@@ -309 +318 @@
         ar & boost::serialization::make_nvp("vector_BasicSource", boost::serialization::base_object<std::vector<BasicSource>>(*this));
     }
+
+public:
+    BasicSources() {}
+    BasicSources(BasicSources&& y) : std::vector<BasicSource>(std::move(y)) {}
+    BasicSources(BasicSources const& y) : std::vector<BasicSource>(y) {}
+    BasicSources operator =(BasicSources&& y)
+    {
+        std::vector<BasicSource>::operator =(std::move(y));
+        return *this;
+    }
+    BasicSources operator =(BasicSources const& y)
+    {
+        return *this = std::move(BasicSources(y));
+    }
 };
 
@@ -336 +359 @@
     {
     }
+    SourceCodePosition(SourceCodePosition const& y)
+        : relationalObjectModuleIndex(y.relationalObjectModuleIndex)
+        , pos(y.pos)
+    {
+    }
+
+    SourceCodePosition& operator =(SourceCodePosition const& y)
+    {
+        relationalObjectModuleIndex = y.relationalObjectModuleIndex;
+        pos = y.pos;
+        return *this;
+    }
 
     int GetRelationalObjectModuleIndex() const;