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

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

@@ -17 +17 @@
 
 public:
-    DynamicMethodsPrototype(){}
-    DynamicMethodsPrototype( const DynamicMethodsPrototype &dynamicMethodsPrototype )
-        : dynamicMethods( dynamicMethodsPrototype.dynamicMethods )
+    DynamicMethodsPrototype() {}
+    DynamicMethodsPrototype(DynamicMethodsPrototype&& dynamicMethodsPrototype)
+        : dynamicMethods(std::move(dynamicMethodsPrototype.dynamicMethods))
     {
     }
+    DynamicMethodsPrototype(const DynamicMethodsPrototype &dynamicMethodsPrototype)
+        : dynamicMethods(dynamicMethodsPrototype.dynamicMethods)
+    {
+    }
+
+    DynamicMethodsPrototype& operator =(DynamicMethodsPrototype&& y)
+    {
+        dynamicMethods = std::move(y.dynamicMethods);
+        return *this;
+    }
+
+    DynamicMethodsPrototype& operator =(DynamicMethodsPrototype const& y)
+    {
+        return *this = std::move(DynamicMethodsPrototype(y));
+    }
+
     ~DynamicMethodsPrototype(){}
 
@@ -62 +78 @@
 public:
     Interface( const CClass *pInterfaceClass, const Types &actualTypeParameters );
+    Interface(Interface&& objInterface)
+        : DynamicMethodsPrototype(std::move(objInterface))
+        , pInterfaceClass(std::move(objInterface.pInterfaceClass))
+        , vtblOffset(std::move(objInterface.vtblOffset))
+    {
+    }
     Interface( const Interface &objInterface )
         : DynamicMethodsPrototype( objInterface )
@@ -72 +94 @@
         , vtblOffset( NULL )
     {
+    }
+
+    Interface& operator =(Interface&& y)
+    {
+        DynamicMethodsPrototype::operator =(std::move(y));
+        pInterfaceClass = std::move(y.pInterfaceClass);
+        vtblOffset = std::move(y.vtblOffset);
+        return *this;
+    }
+
+    Interface& operator =(Interface const& y)
+    {
+        return *this = std::move(Interface(y));
     }