Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical/Variable.cpp

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/src/Lexical/Variable.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/ab_common/src/Lexical/Variable.cpp

@@ -12 +12 @@
 {
 }
+
 Variable::Variable( const Variable &var )
     : RelationalObjectModuleItem( var )
@@ -24 +25 @@
 {
 }
+
+Variable::Variable(Variable&& var)
+    : RelationalObjectModuleItem(std::move(var))
+    , type(std::move(var.type))
+    , isConst(std::move(var.isConst))
+    , isRef(std::move(var.isRef))
+    , isArray(std::move(var.isArray))
+    , subscripts(std::move(var.subscripts))
+    , isParameter(std::move(var.isParameter))
+    , paramStrForConstructor(std::move(var.paramStrForConstructor))
+    , hasInitData(std::move(var.hasInitData))
+{
+}
+
 Variable::Variable()
 {
+}
+
+Variable& Variable::operator =(Variable&& var)
+{
+    RelationalObjectModuleItem::operator =(std::move(var));
+    type = std::move(var.type);
+    isConst = std::move(var.isConst);
+    isRef = std::move(var.isRef);
+    isArray = std::move(var.isArray);
+    subscripts = std::move(var.subscripts);
+    isParameter = std::move(var.isParameter);
+    paramStrForConstructor = std::move(var.paramStrForConstructor);
+    hasInitData = std::move(var.hasInitData);
+    return *this;
 }