Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/TypeDef.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/TypeDef.h (modified) (2 diffs)

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

@@ -42 +42 @@
     }
 
+    TypeDef(TypeDef&& y)
+        : RelationalObjectModuleItem(std::move(y))
+        , baseName(std::move(y.baseName))
+        , baseType(std::move(y.baseType))
+    {
+    }
+
+    TypeDef(TypeDef const& y)
+        : RelationalObjectModuleItem(y)
+        , baseName(y.baseName)
+        , baseType(y.baseType)
+    {
+    }
+
+    TypeDef& operator =(TypeDef&& y)
+    {
+        RelationalObjectModuleItem::operator =(std::move(y));
+        baseName = std::move(y.baseName);
+        baseType = std::move(y.baseType);
+        return *this;
+    }
+
+    TypeDef& operator =(TypeDef const& y)
+    {
+        return *this = std::move(TypeDef(y));
+    }
+
     const std::string &GetBaseName() const
     {
@@ -69 +96 @@
 public:
     TypeDefCollection();
+    TypeDefCollection(TypeDefCollection&& y) : std::vector<TypeDef>(std::move(y)) {}
+    TypeDefCollection(TypeDefCollection const& y) : std::vector<TypeDef>(y) {}
+    TypeDefCollection& operator =(TypeDefCollection&& y)
+    {
+        std::vector<TypeDef>::operator =(std::move(y));
+        return *this;
+    }
+    TypeDefCollection& operator =(TypeDefCollection const& y)
+    {
+        return *this = std::move(TypeDefCollection(y));
+    }
     ~TypeDefCollection();