Changeset 810 in dev for branches/egtra/ab5.0/abdev/ab_common/include/Lexical/Namespace.h

Timestamp:

Feb 14, 2011, 12:58:25 AM (13 years ago)

Author:

イグトランス (egtra)

Message:

ムーブコンストラクタ・ムーブ代入演算子の導入

File:

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

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

@@ -7 +7 @@
 class NamespaceScopes : public std::vector<std::string>
 {
+    typedef std::vector<std::string> Base;
     // XMLシリアライズ用
 private:
@@ -17 +18 @@
 
 public:
-    NamespaceScopes(){}
+    NamespaceScopes() {}
+    NamespaceScopes(NamespaceScopes const& y)
+        : Base(y)
+    {
+    }
+    NamespaceScopes(NamespaceScopes&& y)
+        : Base(std::move(y))
+    {
+    }
     NamespaceScopes( const std::string &namespaceStr );
     NamespaceScopes( NamespaceScopes::const_iterator first, NamespaceScopes::const_iterator last )
-        : std::vector<std::string>( first, last )
+        : Base(first, last)
     {
     }
     ~NamespaceScopes(){}
 
-    NamespaceScopes operator+ ( const NamespaceScopes &namespaceScopes ) const;
-
     void append( const NamespaceScopes &namespaceScopes )
     {
         insert( end(), namespaceScopes.begin(), namespaceScopes.end() );
+    }
+
+    NamespaceScopes& operator +=(const NamespaceScopes &namespaceScopes)
+    {
+        append(namespaceScopes);
+        return *this;
     }
 
@@ -77 +90 @@
 };
 
+NamespaceScopes operator +(const NamespaceScopes &lhs, const NamespaceScopes &rhs);
+
 inline bool operator ==( const NamespaceScopes &lhs, const NamespaceScopes &rhs )
 {
@@ -84 +99 @@
 class NamespaceScopesCollection : public std::vector<NamespaceScopes>
 {
+    typedef std::vector<NamespaceScopes> Base;
     // XMLシリアライズ用
 private:
@@ -93 +109 @@
 
 public:
+    NamespaceScopesCollection() : Base() {}
+    NamespaceScopesCollection(NamespaceScopesCollection&& y) : Base(std::move(y)) {}
+    NamespaceScopesCollection(NamespaceScopesCollection const& y) : Base(y) {}
+    NamespaceScopesCollection& operator =(NamespaceScopesCollection&& y)
+    {
+        Base::operator =(std::move(y));
+        return *this;
+    }
+    NamespaceScopesCollection& operator =(NamespaceScopesCollection const& y)
+    {
+        return operator =(NamespaceScopesCollection(y));
+    }
     bool IsExist( const NamespaceScopes &namespaceScopes ) const
     {