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

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

@@ -56 +56 @@
     {
     }
+
+    Procedure(Procedure const& y)
+        : RelationalObjectModuleItem(y)
+        , kind(y.kind)
+        , isCdecl(y.isCdecl)
+        , isUsing(y.isUsing)
+        , params(y.params)
+        , returnType(y.returnType)
+        , sourceCodePosition(y.sourceCodePosition)
+    {
+    }
+
+    Procedure(Procedure&& y)
+        : RelationalObjectModuleItem(std::move(y))
+        , kind(std::move(y.kind))
+        , isCdecl(std::move(y.isCdecl))
+        , isUsing(std::move(y.isUsing))
+        , params(std::move(y.params))
+        , returnType(std::move(y.returnType))
+        , sourceCodePosition(std::move(y.sourceCodePosition))
+    {
+    }
+
+    Procedure& operator =(Procedure&& y)
+    {
+        RelationalObjectModuleItem::operator =(std::move(y));
+        kind = std::move(y.kind);
+        isCdecl = std::move(y.isCdecl);
+        isUsing = std::move(y.isUsing);
+        params = std::move(y.params);
+        returnType = std::move(y.returnType);
+        sourceCodePosition = std::move(y.sourceCodePosition);
+        return *this;
+    }
+
+    Procedure& operator =(Procedure const& y)
+    {
+        return *this = std::move(Procedure(y));
+    }
+
     ~Procedure(){
         foreach( Parameter *pParam, params ){
@@ -393 +433 @@
 
     static const UserProc *pGlobalProc;
+
+private:
+    UserProc(UserProc const&);
+    UserProc& operator =(UserProc const&);
 };
 
@@ -418 +462 @@
 
     void EnumGlobalProcs( const char *simpleName, const Symbol &localSymbol, std::vector<const UserProc *> &subs );
+
+private:
+    UserProcs(UserProcs const&);
+    UserProcs& operator =(UserProcs const&);
 };
 
@@ -499 +547 @@
 
     virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
+
+private:
+    DllProc(DllProc const&);
+    DllProc& operator =(DllProc const&);
 };
 class DllProcs : public Jenga::Common::Hashmap<DllProc>
 {
+public:
+    DllProcs() {}
+
     // XMLシリアライズ用
 private:
@@ -512 +567 @@
             boost::serialization::base_object<Jenga::Common::Hashmap<DllProc>>(*this));
     }
+
+    DllProcs(DllProcs const&);
+    DllProcs& operator =(DllProcs const&);
 };
 
@@ -540 +598 @@
 
     virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
+
+    ProcPointer(ProcPointer const&);
+    ProcPointer& operator =(ProcPointer const&);
 };
 
@@ -569 +630 @@
         clear();
     }
+
+    ProcPointers(ProcPointers const&);
+    ProcPointers& operator =(ProcPointers const&);
 };