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

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

@@ -38 +38 @@
 
 public:
-    Symbol( const NamespaceScopes &namespaceScopes, const std::string &name )
-        : namespaceScopes( namespaceScopes )
-        , name( name )
+    Symbol(NamespaceScopes namespaceScopes, std::string name)
+        : namespaceScopes(std::move(namespaceScopes))
+        , name(std::move(name))
     {
     }
-    Symbol( const Symbol &symbol )
-        : namespaceScopes( symbol.namespaceScopes )
-        , name( symbol.name )
+    Symbol(const Symbol &symbol)
+        : namespaceScopes(symbol.namespaceScopes)
+        , name(symbol.name)
+    {
+    }
+    Symbol(Symbol&& symbol)
+        : namespaceScopes(std::move(symbol.namespaceScopes))
+        , name(std::move(symbol.name))
     {
     }
     Symbol()
     {
+    }
+    Symbol& operator =(Symbol&& symbol)
+    {
+        namespaceScopes = std::move(symbol.namespaceScopes);
+        name = std::move(symbol.name);
+        return *this;
+    }
+    Symbol& operator =(Symbol const& symbol)
+    {
+        return *this = Symbol(symbol);
     }