[Mobies-commit] [commit] r3612 - in UDM/trunk: etc include src/UdmBase src/Uml
endre at redhat1.isis.vanderbilt.edu
endre at redhat1.isis.vanderbilt.edu
Sat Jan 22 18:28:22 CST 2011
Author: endre
Date: Sat Jan 22 18:28:22 2011
New Revision: 3612
Log:
check-in after BootUdm, just to make sure everything is generated by UDM and not manually edited.
A later check-in will fix the memory leak in Uml.cpp (by changing the generator)
Modified:
UDM/trunk/etc/UdmProject.xsd
UDM/trunk/etc/UdmProject_udm.xml
UDM/trunk/include/UdmProject.h
UDM/trunk/include/Uml.h
UDM/trunk/src/UdmBase/UdmProject.cpp
UDM/trunk/src/UdmBase/UdmProject_xsd.h
UDM/trunk/src/Uml/Uml.cpp
UDM/trunk/src/Uml/Uml.h
UDM/trunk/src/Uml/Uml.xsd
UDM/trunk/src/Uml/Uml_xsd.h
Modified: UDM/trunk/etc/UdmProject.xsd
==============================================================================
--- UDM/trunk/etc/UdmProject.xsd Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/etc/UdmProject.xsd Sat Jan 22 18:28:22 2011 (r3612)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Fri Dec 31 08:14:15 2010 -->
+<!-- generated on Sun Jan 23 02:22:25 2011 -->
<xsd:complexType name="DatanetworkType">
Modified: UDM/trunk/etc/UdmProject_udm.xml
==============================================================================
--- UDM/trunk/etc/UdmProject_udm.xml Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/etc/UdmProject_udm.xml Sat Jan 22 18:28:22 2011 (r3612)
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Diagram name="UdmProject" version="1.00" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Uml.xsd">
-
- <Class _id="id5" isAbstract="false" name="Project" parentRoles="id6 id8 idA">
- <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
- </Class>
-
- <Class _id="id3" childRoles="id4 id7 id9" isAbstract="false" name="Datanetwork">
- <Attribute max="1" min="1" name="systemname" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
- <Attribute max="1" min="1" name="metaDgr" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
- <Attribute max="1" min="0" name="metalocator" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
- </Class>
-
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id4" isNavigable="true" max="1" min="0" name="cross_associations" target="id3"/>
- <CompositionParentRole _id="id6" isNavigable="true" target="id5"/>
- </Composition>
-
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id7" isNavigable="true" max="-1" min="0" name="instances" target="id3"/>
- <CompositionParentRole _id="id8" isNavigable="true" target="id5"/>
- </Composition>
-
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id9" isNavigable="true" max="1" min="0" name="crosslinks" target="id3"/>
- <CompositionParentRole _id="idA" isNavigable="true" target="id5"/>
- </Composition>
-
-</Diagram>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Diagram name="UdmProject" version="1.00" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Uml.xsd">
+
+ <Class _id="id5" isAbstract="false" name="Project" parentRoles="id6 id8 idA">
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Class _id="id3" childRoles="id4 id7 id9" isAbstract="false" name="Datanetwork">
+ <Attribute max="1" min="1" name="systemname" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="1" name="metaDgr" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="0" name="metalocator" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id4" isNavigable="true" max="1" min="0" name="cross_associations" target="id3"/>
+ <CompositionParentRole _id="id6" isNavigable="true" target="id5"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id7" isNavigable="true" max="-1" min="0" name="instances" target="id3"/>
+ <CompositionParentRole _id="id8" isNavigable="true" target="id5"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id9" isNavigable="true" max="1" min="0" name="crosslinks" target="id3"/>
+ <CompositionParentRole _id="idA" isNavigable="true" target="id5"/>
+ </Composition>
+
+</Diagram>
Modified: UDM/trunk/include/UdmProject.h
==============================================================================
--- UDM/trunk/include/UdmProject.h Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/include/UdmProject.h Sat Jan 22 18:28:22 2011 (r3612)
@@ -2,7 +2,7 @@
#define MOBIES_UDMPROJECT_H
// header file UdmProject.h generated from diagram UdmProject
-// generated with Udm version 3.27 on Fri Dec 31 08:14:15 2010
+// generated with Udm version 3.27 on Sun Jan 23 02:22:25 2011
#include <UdmBase.h>
@@ -43,8 +43,8 @@
#ifdef UDM_RVALUE
Datanetwork(Datanetwork &&master) : UDM_OBJECT(master) {}
- static Datanetwork Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Datanetwork& operator=(Datanetwork &&a) { Udm::Object::operator =(a); return *this; }
+ static Datanetwork Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Datanetwork& operator=(Datanetwork &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Datanetwork Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Datanetwork Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -81,8 +81,8 @@
#ifdef UDM_RVALUE
Project(Project &&master) : UDM_OBJECT(master) {}
- static Project Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Project& operator=(Project &&a) { Udm::Object::operator =(a); return *this; }
+ static Project Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Project& operator=(Project &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Project Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Project Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
Modified: UDM/trunk/include/Uml.h
==============================================================================
--- UDM/trunk/include/Uml.h Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/include/Uml.h Sat Jan 22 18:28:22 2011 (r3612)
@@ -2,7 +2,7 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.27 on Fri Dec 31 08:14:18 2010
+// generated with Udm version 3.27 on Sun Jan 23 02:22:28 2011
#include <UdmBase.h>
@@ -56,8 +56,8 @@
#ifdef UDM_RVALUE
GenericRole(GenericRole &&master) : UDM_OBJECT(master) {}
- static GenericRole Cast(Udm::Object &&a) { return __Cast(a, meta); }
- GenericRole& operator=(GenericRole &&a) { Udm::Object::operator =(a); return *this; }
+ static GenericRole Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ GenericRole& operator=(GenericRole &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static GenericRole Cast(const Udm::Object &a) { return __Cast(a, meta); }
static GenericRole Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -86,8 +86,8 @@
#ifdef UDM_RVALUE
CompositionChildRole(CompositionChildRole &&master) : GenericRole(master) {}
- static CompositionChildRole Cast(Udm::Object &&a) { return __Cast(a, meta); }
- CompositionChildRole& operator=(CompositionChildRole &&a) { Udm::Object::operator =(a); return *this; }
+ static CompositionChildRole Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ CompositionChildRole& operator=(CompositionChildRole &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static CompositionChildRole Cast(const Udm::Object &a) { return __Cast(a, meta); }
static CompositionChildRole Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -119,8 +119,8 @@
#ifdef UDM_RVALUE
CompositionParentRole(CompositionParentRole &&master) : GenericRole(master) {}
- static CompositionParentRole Cast(Udm::Object &&a) { return __Cast(a, meta); }
- CompositionParentRole& operator=(CompositionParentRole &&a) { Udm::Object::operator =(a); return *this; }
+ static CompositionParentRole Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ CompositionParentRole& operator=(CompositionParentRole &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static CompositionParentRole Cast(const Udm::Object &a) { return __Cast(a, meta); }
static CompositionParentRole Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -148,8 +148,8 @@
#ifdef UDM_RVALUE
AssociationRole(AssociationRole &&master) : GenericRole(master) {}
- static AssociationRole Cast(Udm::Object &&a) { return __Cast(a, meta); }
- AssociationRole& operator=(AssociationRole &&a) { Udm::Object::operator =(a); return *this; }
+ static AssociationRole Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ AssociationRole& operator=(AssociationRole &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static AssociationRole Cast(const Udm::Object &a) { return __Cast(a, meta); }
static AssociationRole Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -187,8 +187,8 @@
#ifdef UDM_RVALUE
Class(Class &&master) : UDM_OBJECT(master) {}
- static Class Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Class& operator=(Class &&a) { Udm::Object::operator =(a); return *this; }
+ static Class Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Class& operator=(Class &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Class Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Class Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -261,8 +261,8 @@
#ifdef UDM_RVALUE
Diagram(Diagram &&master) : UDM_OBJECT(master) {}
- static Diagram Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Diagram& operator=(Diagram &&a) { Udm::Object::operator =(a); return *this; }
+ static Diagram Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Diagram& operator=(Diagram &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Diagram Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Diagram Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -311,8 +311,8 @@
#ifdef UDM_RVALUE
Association(Association &&master) : UDM_OBJECT(master) {}
- static Association Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Association& operator=(Association &&a) { Udm::Object::operator =(a); return *this; }
+ static Association Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Association& operator=(Association &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Association Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Association Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -358,8 +358,8 @@
#ifdef UDM_RVALUE
Composition(Composition &&master) : UDM_OBJECT(master) {}
- static Composition Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Composition& operator=(Composition &&a) { Udm::Object::operator =(a); return *this; }
+ static Composition Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Composition& operator=(Composition &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Composition Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Composition Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -401,8 +401,8 @@
#ifdef UDM_RVALUE
Namespace(Namespace &&master) : UDM_OBJECT(master) {}
- static Namespace Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Namespace& operator=(Namespace &&a) { Udm::Object::operator =(a); return *this; }
+ static Namespace Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Namespace& operator=(Namespace &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Namespace Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Namespace Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -452,8 +452,8 @@
#ifdef UDM_RVALUE
TaggedValue(TaggedValue &&master) : UDM_OBJECT(master) {}
- static TaggedValue Cast(Udm::Object &&a) { return __Cast(a, meta); }
- TaggedValue& operator=(TaggedValue &&a) { Udm::Object::operator =(a); return *this; }
+ static TaggedValue Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ TaggedValue& operator=(TaggedValue &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static TaggedValue Cast(const Udm::Object &a) { return __Cast(a, meta); }
static TaggedValue Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -486,8 +486,8 @@
#ifdef UDM_RVALUE
ConstraintDefinition(ConstraintDefinition &&master) : UDM_OBJECT(master) {}
- static ConstraintDefinition Cast(Udm::Object &&a) { return __Cast(a, meta); }
- ConstraintDefinition& operator=(ConstraintDefinition &&a) { Udm::Object::operator =(a); return *this; }
+ static ConstraintDefinition Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ ConstraintDefinition& operator=(ConstraintDefinition &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static ConstraintDefinition Cast(const Udm::Object &a) { return __Cast(a, meta); }
static ConstraintDefinition Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -523,8 +523,8 @@
#ifdef UDM_RVALUE
Attribute(Attribute &&master) : UDM_OBJECT(master) {}
- static Attribute Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Attribute& operator=(Attribute &&a) { Udm::Object::operator =(a); return *this; }
+ static Attribute Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Attribute& operator=(Attribute &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Attribute Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Attribute Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -568,8 +568,8 @@
#ifdef UDM_RVALUE
Constraint(Constraint &&master) : UDM_OBJECT(master) {}
- static Constraint Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Constraint& operator=(Constraint &&a) { Udm::Object::operator =(a); return *this; }
+ static Constraint Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Constraint& operator=(Constraint &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Constraint Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Constraint Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
Modified: UDM/trunk/src/UdmBase/UdmProject.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject.cpp Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/src/UdmBase/UdmProject.cpp Sat Jan 22 18:28:22 2011 (r3612)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file UdmProject.cpp
// generated from diagram UdmProject
-// generated on Fri Dec 31 08:14:15 2010
+// generated on Sun Jan 23 02:22:25 2011
#include "UdmProject.h"
#include <UmlExt.h>
Modified: UDM/trunk/src/UdmBase/UdmProject_xsd.h
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject_xsd.h Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/src/UdmBase/UdmProject_xsd.h Sat Jan 22 18:28:22 2011 (r3612)
@@ -15,7 +15,7 @@
str +="<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n";
str +=" elementFormDefault=\"qualified\" \n";
str +=">\n";
-// str +="<!-- generated on Fri Dec 31 08:14:15 2010 -->\n";
+// str +="<!-- generated on Sun Jan 23 02:22:25 2011 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"DatanetworkType\">\n";
Modified: UDM/trunk/src/Uml/Uml.cpp
==============================================================================
--- UDM/trunk/src/Uml/Uml.cpp Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/src/Uml/Uml.cpp Sat Jan 22 18:28:22 2011 (r3612)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file Uml.cpp
// generated from diagram Uml
-// generated on Fri Dec 31 08:14:18 2010
+// generated on Sun Jan 23 02:22:28 2011
#include "Uml.h"
#include <UmlExt.h>
@@ -506,10 +506,6 @@
InitMetaLinks();
::Uml::InitDiagram(meta, "Uml", "2.04");
- UdmStatic::StaticDataNetwork* dn = new UdmStatic::StaticDataNetwork(diagram, 0);
- dn->rootobject = meta;
- dn->systemname = "Uml";
- dn->sem = Udm::CHANGES_LOST_DEFAULT;
_SetXsdStorage();
Modified: UDM/trunk/src/Uml/Uml.h
==============================================================================
--- UDM/trunk/src/Uml/Uml.h Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/src/Uml/Uml.h Sat Jan 22 18:28:22 2011 (r3612)
@@ -2,7 +2,7 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.27 on Fri Dec 31 08:14:18 2010
+// generated with Udm version 3.27 on Sun Jan 23 02:22:28 2011
#include <UdmBase.h>
@@ -56,8 +56,8 @@
#ifdef UDM_RVALUE
GenericRole(GenericRole &&master) : UDM_OBJECT(master) {}
- static GenericRole Cast(Udm::Object &&a) { return __Cast(a, meta); }
- GenericRole& operator=(GenericRole &&a) { Udm::Object::operator =(a); return *this; }
+ static GenericRole Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ GenericRole& operator=(GenericRole &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static GenericRole Cast(const Udm::Object &a) { return __Cast(a, meta); }
static GenericRole Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -86,8 +86,8 @@
#ifdef UDM_RVALUE
CompositionChildRole(CompositionChildRole &&master) : GenericRole(master) {}
- static CompositionChildRole Cast(Udm::Object &&a) { return __Cast(a, meta); }
- CompositionChildRole& operator=(CompositionChildRole &&a) { Udm::Object::operator =(a); return *this; }
+ static CompositionChildRole Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ CompositionChildRole& operator=(CompositionChildRole &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static CompositionChildRole Cast(const Udm::Object &a) { return __Cast(a, meta); }
static CompositionChildRole Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -119,8 +119,8 @@
#ifdef UDM_RVALUE
CompositionParentRole(CompositionParentRole &&master) : GenericRole(master) {}
- static CompositionParentRole Cast(Udm::Object &&a) { return __Cast(a, meta); }
- CompositionParentRole& operator=(CompositionParentRole &&a) { Udm::Object::operator =(a); return *this; }
+ static CompositionParentRole Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ CompositionParentRole& operator=(CompositionParentRole &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static CompositionParentRole Cast(const Udm::Object &a) { return __Cast(a, meta); }
static CompositionParentRole Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -148,8 +148,8 @@
#ifdef UDM_RVALUE
AssociationRole(AssociationRole &&master) : GenericRole(master) {}
- static AssociationRole Cast(Udm::Object &&a) { return __Cast(a, meta); }
- AssociationRole& operator=(AssociationRole &&a) { Udm::Object::operator =(a); return *this; }
+ static AssociationRole Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ AssociationRole& operator=(AssociationRole &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static AssociationRole Cast(const Udm::Object &a) { return __Cast(a, meta); }
static AssociationRole Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -187,8 +187,8 @@
#ifdef UDM_RVALUE
Class(Class &&master) : UDM_OBJECT(master) {}
- static Class Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Class& operator=(Class &&a) { Udm::Object::operator =(a); return *this; }
+ static Class Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Class& operator=(Class &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Class Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Class Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -261,8 +261,8 @@
#ifdef UDM_RVALUE
Diagram(Diagram &&master) : UDM_OBJECT(master) {}
- static Diagram Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Diagram& operator=(Diagram &&a) { Udm::Object::operator =(a); return *this; }
+ static Diagram Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Diagram& operator=(Diagram &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Diagram Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Diagram Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -311,8 +311,8 @@
#ifdef UDM_RVALUE
Association(Association &&master) : UDM_OBJECT(master) {}
- static Association Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Association& operator=(Association &&a) { Udm::Object::operator =(a); return *this; }
+ static Association Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Association& operator=(Association &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Association Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Association Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -358,8 +358,8 @@
#ifdef UDM_RVALUE
Composition(Composition &&master) : UDM_OBJECT(master) {}
- static Composition Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Composition& operator=(Composition &&a) { Udm::Object::operator =(a); return *this; }
+ static Composition Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Composition& operator=(Composition &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Composition Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Composition Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -401,8 +401,8 @@
#ifdef UDM_RVALUE
Namespace(Namespace &&master) : UDM_OBJECT(master) {}
- static Namespace Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Namespace& operator=(Namespace &&a) { Udm::Object::operator =(a); return *this; }
+ static Namespace Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Namespace& operator=(Namespace &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Namespace Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Namespace Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -452,8 +452,8 @@
#ifdef UDM_RVALUE
TaggedValue(TaggedValue &&master) : UDM_OBJECT(master) {}
- static TaggedValue Cast(Udm::Object &&a) { return __Cast(a, meta); }
- TaggedValue& operator=(TaggedValue &&a) { Udm::Object::operator =(a); return *this; }
+ static TaggedValue Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ TaggedValue& operator=(TaggedValue &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static TaggedValue Cast(const Udm::Object &a) { return __Cast(a, meta); }
static TaggedValue Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -486,8 +486,8 @@
#ifdef UDM_RVALUE
ConstraintDefinition(ConstraintDefinition &&master) : UDM_OBJECT(master) {}
- static ConstraintDefinition Cast(Udm::Object &&a) { return __Cast(a, meta); }
- ConstraintDefinition& operator=(ConstraintDefinition &&a) { Udm::Object::operator =(a); return *this; }
+ static ConstraintDefinition Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ ConstraintDefinition& operator=(ConstraintDefinition &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static ConstraintDefinition Cast(const Udm::Object &a) { return __Cast(a, meta); }
static ConstraintDefinition Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -523,8 +523,8 @@
#ifdef UDM_RVALUE
Attribute(Attribute &&master) : UDM_OBJECT(master) {}
- static Attribute Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Attribute& operator=(Attribute &&a) { Udm::Object::operator =(a); return *this; }
+ static Attribute Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Attribute& operator=(Attribute &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Attribute Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Attribute Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
@@ -568,8 +568,8 @@
#ifdef UDM_RVALUE
Constraint(Constraint &&master) : UDM_OBJECT(master) {}
- static Constraint Cast(Udm::Object &&a) { return __Cast(a, meta); }
- Constraint& operator=(Constraint &&a) { Udm::Object::operator =(a); return *this; }
+ static Constraint Cast(Udm::Object &&a) { return __Cast(std::move(a), meta); }
+ Constraint& operator=(Constraint &&a) { Udm::Object::operator =(std::move(a)); return *this; }
#endif
static Constraint Cast(const Udm::Object &a) { return __Cast(a, meta); }
static Constraint Create(const Udm::Object &parent, const ::Uml::CompositionChildRole &role = Udm::NULLCHILDROLE) { return __Create(meta, parent, role); }
Modified: UDM/trunk/src/Uml/Uml.xsd
==============================================================================
--- UDM/trunk/src/Uml/Uml.xsd Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/src/Uml/Uml.xsd Sat Jan 22 18:28:22 2011 (r3612)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Fri Dec 31 08:14:17 2010 -->
+<!-- generated on Sun Jan 23 02:22:27 2011 -->
<xsd:complexType name="CompositionChildRoleType">
Modified: UDM/trunk/src/Uml/Uml_xsd.h
==============================================================================
--- UDM/trunk/src/Uml/Uml_xsd.h Thu Jan 20 10:43:01 2011 (r3611)
+++ UDM/trunk/src/Uml/Uml_xsd.h Sat Jan 22 18:28:22 2011 (r3612)
@@ -15,7 +15,7 @@
str +="<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n";
str +=" elementFormDefault=\"qualified\" \n";
str +=">\n";
-// str +="<!-- generated on Fri Dec 31 08:14:17 2010 -->\n";
+// str +="<!-- generated on Sun Jan 23 02:22:27 2011 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"CompositionChildRoleType\">\n";
More information about the Mobies-commit
mailing list