Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/RelationalObjectModuleItem.h

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/ab_common/include/Lexical/RelationalObjectModuleItem.h (modified) (4 diffs)

trunk/ab5.0/abdev/ab_common/include/Lexical/RelationalObjectModuleItem.h

@@ -20 +20 @@
     }
 
-public:
+protected:
+    RelationalObjectModuleItem(RelationalObjectModuleItem&& relationalObjectModuleItem)
+        : Symbol(std::move(relationalObjectModuleItem))
+        , relationalObjectModuleIndex(std::move(relationalObjectModuleItem.relationalObjectModuleIndex))
+        , isNeedResolve(std::move(false))
+    {
+    }
+
     RelationalObjectModuleItem( const RelationalObjectModuleItem &relationalObjectModuleItem )
         : Symbol( relationalObjectModuleItem )
@@ -27 +34 @@
     {
     }
+
     RelationalObjectModuleItem( const Symbol &symbol )
         : Symbol( symbol )
@@ -33 +41 @@
     {
     }
+
     RelationalObjectModuleItem()
         : relationalObjectModuleIndex( -1 )
@@ -39 +48 @@
     }
 
+    RelationalObjectModuleItem& operator =(RelationalObjectModuleItem&& y)
+    {
+        Symbol::operator =(std::move(y));
+        relationalObjectModuleIndex = std::move(y.relationalObjectModuleIndex);
+        isNeedResolve = std::move(y.isNeedResolve);
+        return *this;
+    }
+
+    RelationalObjectModuleItem& operator =(RelationalObjectModuleItem const& y)
+    {
+        Symbol::operator =(y);
+        relationalObjectModuleIndex = y.relationalObjectModuleIndex;
+        isNeedResolve = y.isNeedResolve;
+        return *this;
+    }
+
+public:
     int GetRelationalObjectModuleIndex() const
     {