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

Timestamp:

Mar 19, 2012, 1:59:48 AM (13 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/Namespace.cpp (modified) (3 diffs)

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

@@ -1 +1 @@
 #include "stdafx.h"
+#include <jenga/include/jenga.h>
+#include <abdev/ab_common/include/ab_common.h>
 #include <algorithm>
 
@@ -16 +18 @@
         std::string tempName = namespaceStr.substr( i, i2-i );
 
-        push_back( tempName );
+        push_back(std::move(tempName));
 
         if( i2 == std::string::npos ){
@@ -26 +28 @@
 }
 
-NamespaceScopes NamespaceScopes::operator+ ( const NamespaceScopes &namespaceScopes ) const
+NamespaceScopes ActiveBasic::Common::Lexical::operator +(const NamespaceScopes &lhs, const NamespaceScopes &rhs)
 {
-    NamespaceScopes result;
-    result.reserve( this->size() + namespaceScopes.size() );
-    result = *this;
-    result.append( namespaceScopes );
-    return result;
+    return NamespaceScopes(lhs) += rhs;
 }