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

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

@@ -15 +15 @@
     }
 
+    ResolveError(ResolveError&& y)
+        : relationalObjectModuleIndex(std::move(y.relationalObjectModuleIndex))
+        , targetItemName(std::move(y.targetItemName))
+    {
+    }
+
+    ResolveError(ResolveError const& y)
+        : relationalObjectModuleIndex(y.relationalObjectModuleIndex)
+        , targetItemName(y.targetItemName)
+    {
+    }
+
+    ResolveError& operator =(ResolveError&& y)
+    {
+        relationalObjectModuleIndex = std::move(y.relationalObjectModuleIndex);
+        targetItemName = std::move(y.targetItemName);
+        return *this;
+    }
+
+    ResolveError& operator =(ResolveError const& y)
+    {
+        return *this = std::move(ResolveError(y));
+    }
+
     int GetRelationalObjectModuleIndex() const
     {
@@ -28 +52 @@
 {
 public:
+    ResolveErrors() {}
+    ResolveErrors(ResolveErrors&& y) : std::vector<ResolveError>(std::move(y)) {}
+    ResolveErrors(ResolveErrors const& y) : std::vector<ResolveError>(y) {}
+    ResolveErrors& operator =(ResolveErrors&& y)
+    {
+        std::vector<ResolveError>::operator =(std::move(y));
+        return *this;
+    }
+    ResolveErrors& operator =(ResolveErrors const& y)
+    {
+        return *this = std::move(ResolveErrors(y));
+    }
+
     void Add( const ResolveError &resolveError )
     {