[Mobies-commit] [commit] r3704 - in UDM/trunk: etc include src/UML GME/Interpreter src/Udm src/UdmBackendDump src/UdmBase src/UdmGme src/UdmOcl src/UdmOclPat src/UdmPython src/UdmViz src/Uml
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Mon May 2 10:19:24 CDT 2011
Author: ksmyth
Date: Mon May 2 10:19:24 2011
New Revision: 3704
Log:
Dont pollute global namespace with std
Modified:
UDM/trunk/etc/UdmProject.xsd
UDM/trunk/include/ErrHand.h
UDM/trunk/include/Udm.i
UDM/trunk/include/UdmBase.h
UDM/trunk/include/UdmDom.h
UDM/trunk/include/UdmGme.h
UDM/trunk/include/UdmOcl.h
UDM/trunk/include/UdmProject.h
UDM/trunk/include/UdmStatic.h
UDM/trunk/include/UdmUtil.h
UDM/trunk/include/Uml.h
UDM/trunk/include/UmlExt.h
UDM/trunk/src/UML GME/Interpreter/AttributeObject.cpp
UDM/trunk/src/UML GME/Interpreter/BONComponent.cpp
UDM/trunk/src/Udm/Udm.h
UDM/trunk/src/Udm/UdmCpp.cpp
UDM/trunk/src/UdmBackendDump/BackendDump.cpp
UDM/trunk/src/UdmBackendDump/BackendDump.h
UDM/trunk/src/UdmBackendDump/UdmBackendDump.cpp
UDM/trunk/src/UdmBase/DTDGen.h
UDM/trunk/src/UdmBase/UdmProject.cpp
UDM/trunk/src/UdmBase/UdmProject_xsd.h
UDM/trunk/src/UdmGme/GmeObject.h
UDM/trunk/src/UdmGme/MgaDefs.h
UDM/trunk/src/UdmOcl/UdmOclType.cpp
UDM/trunk/src/UdmOclPat/UDMPat.cpp
UDM/trunk/src/UdmPython/UdmPython.cpp
UDM/trunk/src/UdmViz/UdmViz.cpp
UDM/trunk/src/UdmViz/UdmVizDump.cpp
UDM/trunk/src/UdmViz/UdmVizDump.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 Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/etc/UdmProject.xsd Mon May 2 10:19:24 2011 (r3704)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Mon Mar 07 10:31:53 2011 -->
+<!-- generated on Mon May 02 10:02:17 2011 -->
<xsd:complexType name="DatanetworkType">
Modified: UDM/trunk/include/ErrHand.h
==============================================================================
--- UDM/trunk/include/ErrHand.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/ErrHand.h Mon May 2 10:19:24 2011 (r3704)
@@ -29,8 +29,6 @@
#include <exception>
#include <string>
-//std:: namespace qualifier required by STL v3.3
-using namespace std;
#ifdef _WIN32
@@ -64,12 +62,12 @@
#define UDM_RVALUE
#endif
-class udm_exception : public exception
+class udm_exception : public std::exception
{
public:
udm_exception() throw();
udm_exception(const udm_exception &a) throw() : description(a.description) { }
- udm_exception(const string &d) throw() : description(d) { }
+ udm_exception(const std::string &d) throw() : description(d) { }
udm_exception(const char *d) throw() : description(d) { }
const udm_exception &operator =(const udm_exception &a) throw()
{ description = a.description; return *this; }
@@ -77,7 +75,7 @@
virtual const char *what() const throw() { return description.c_str(); }
protected:
- string description;
+ std::string description;
};
// int64
Modified: UDM/trunk/include/Udm.i
==============================================================================
--- UDM/trunk/include/Udm.i Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/Udm.i Mon May 2 10:19:24 2011 (r3704)
@@ -89,8 +89,10 @@
}
-// Only part of ErrHand.h in Udm.i:
using namespace std;
+%{
+using namespace std;
+%}
// Some strings aren't marked const
// %apply const std::string& { UDM_NAMESPACE::string& };
Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/UdmBase.h Mon May 2 10:19:24 2011 (r3704)
@@ -251,6 +251,7 @@
namespace UDM_NAMESPACE
{
+ using namespace std;
// --------------------------- ObjectImpl
// NOTE: All returned ObjectImpl pointers are refCounted (if not NULL),
@@ -4033,12 +4034,12 @@
//the biggest i64 integer is 20 characters long in decimal format.
#ifdef _WIN32
#if (_MSC_VER == 1200)
-inline UDM_DLL ostream & operator<< (ostream &o, __int64 i) { char k[30];sprintf(k,"%I64d", i); o << k; return o;};
+inline UDM_DLL std::ostream & operator<< (ostream &o, __int64 i) { char k[30];sprintf(k,"%I64d", i); o << k; return o;};
#endif
#endif
-inline UDM_DLL ostream & operator<< (ostream &o, Udm::StringAttr c) { o << (string)c; return o; };
+inline UDM_DLL std::ostream & operator<< (std::ostream &o, Udm::StringAttr c) { o << (std::string)c; return o; };
//defines for using backends
#ifdef _WIN32
Modified: UDM/trunk/include/UdmDom.h
==============================================================================
--- UDM/trunk/include/UdmDom.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/UdmDom.h Mon May 2 10:19:24 2011 (r3704)
@@ -54,12 +54,13 @@
XERCES_CPP_NAMESPACE_END
XERCES_CPP_NAMESPACE_USE
-typedef map<unsigned long, DOMElement*> IdToDomElementMap;
-typedef pair<const unsigned long, DOMElement*> IdToDomElementMapItem;
+typedef std::map<unsigned long, DOMElement*> IdToDomElementMap;
+typedef std::pair<const unsigned long, DOMElement*> IdToDomElementMapItem;
namespace UdmDom
{
+ using namespace std;
typedef Udm::Object Object;
//check if an input XML is in UDM UML or XMI UML format
Modified: UDM/trunk/include/UdmGme.h
==============================================================================
--- UDM/trunk/include/UdmGme.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/UdmGme.h Mon May 2 10:19:24 2011 (r3704)
@@ -75,6 +75,7 @@
namespace UdmGme
{
+ using namespace std;
typedef Udm::Object Object;
//these structs are defined in UdmGme.cpp
Modified: UDM/trunk/include/UdmOcl.h
==============================================================================
--- UDM/trunk/include/UdmOcl.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/UdmOcl.h Mon May 2 10:19:24 2011 (r3704)
@@ -31,6 +31,7 @@
namespace Ocl
{
+ using namespace std;
//class UDM_DLL Evaluator;
Modified: UDM/trunk/include/UdmProject.h
==============================================================================
--- UDM/trunk/include/UdmProject.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/UdmProject.h Mon May 2 10:19:24 2011 (r3704)
@@ -2,7 +2,7 @@
#define MOBIES_UDMPROJECT_H
// header file UdmProject.h generated from diagram UdmProject
-// generated with Udm version 3.27 on Mon Mar 07 10:31:53 2011
+// generated with Udm version 3.27 on Mon May 02 10:02:17 2011
#include <UdmBase.h>
Modified: UDM/trunk/include/UdmStatic.h
==============================================================================
--- UDM/trunk/include/UdmStatic.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/UdmStatic.h Mon May 2 10:19:24 2011 (r3704)
@@ -61,16 +61,16 @@
*/
template <class T, class Z>
-class udm_multimap : public multimap<T, Z>
+class udm_multimap : public std::multimap<T, Z>
{
//no private members, others than those in multimap
public:
- udm_multimap<T,Z>() : multimap<T,Z>(){};
- pair<typename multimap<T, Z>::iterator, bool> safe_insert(typename multimap<T,Z>::value_type& item)
+ udm_multimap<T,Z>() : std::multimap<T,Z>(){};
+ std::pair<typename std::multimap<T, Z>::iterator, bool> safe_insert(typename std::multimap<T,Z>::value_type& item)
{
- pair<TYPENAME multimap<T, Z>::iterator, TYPENAME multimap<T, Z>::iterator> it_pair = this->equal_range(item.first);
- TYPENAME multimap<T, Z>::iterator i = it_pair.first;
+ pair<TYPENAME std::multimap<T, Z>::iterator, TYPENAME multimap<T, Z>::iterator> it_pair = this->equal_range(item.first);
+ TYPENAME std::multimap<T, Z>::iterator i = it_pair.first;
bool found = false;
while (i != it_pair.second && !found)
{
@@ -80,15 +80,16 @@
if (!found)
{
- TYPENAME multimap<T, Z>::iterator inserted_at = insert(item);
- return pair<TYPENAME multimap<T, Z>::iterator,bool> (inserted_at, true);
+ TYPENAME std::multimap<T, Z>::iterator inserted_at = insert(item);
+ return std::pair<TYPENAME multimap<T, Z>::iterator,bool> (inserted_at, true);
}
- return pair<TYPENAME multimap<T, Z>::iterator,bool>(this->end(), false);
+ return std::pair<TYPENAME multimap<T, Z>::iterator,bool>(this->end(), false);
}
};
namespace UdmStatic
{
+ using namespace std;
typedef Udm::Object Object;
typedef Udm::ObjectImpl ObjectImpl;
typedef ObjectImpl::uniqueId_type uniqueId_type;
Modified: UDM/trunk/include/UdmUtil.h
==============================================================================
--- UDM/trunk/include/UdmUtil.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/UdmUtil.h Mon May 2 10:19:24 2011 (r3704)
@@ -31,7 +31,8 @@
namespace UdmUtil
{
- typedef map<Udm::Object, Udm::Object> copy_assoc_map;
+ using std::string;
+ typedef std::map<Udm::Object, Udm::Object> copy_assoc_map;
struct CopyOpts {
// a data network copy has been started
@@ -68,8 +69,8 @@
UDM_DLL string escape_chars(const string &src, const char escape_char, const string &to_escape_chars);
//convert array of strings to string and back; used by backends that store array attributes as strings
- UDM_DLL string vector_to_string(const vector<string> &v, const char separator, bool add_sep_at_end = false, bool unquote_strings = false);
- UDM_DLL vector<string> string_to_vector(const string &src, const char separator);
+ UDM_DLL string vector_to_string(const std::vector<string> &v, const char separator, bool add_sep_at_end = false, bool unquote_strings = false);
+ UDM_DLL std::vector<string> string_to_vector(const string &src, const char separator);
UDM_DLL string replace_delimiter(const string &s, const string &old_d, const string &new_d);
Modified: UDM/trunk/include/Uml.h
==============================================================================
--- UDM/trunk/include/Uml.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/Uml.h Mon May 2 10:19:24 2011 (r3704)
@@ -2,7 +2,7 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.27 on Mon Mar 07 10:31:53 2011
+// generated with Udm version 3.27 on Mon May 02 10:03:39 2011
#include <UdmBase.h>
Modified: UDM/trunk/include/UmlExt.h
==============================================================================
--- UDM/trunk/include/UmlExt.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/include/UmlExt.h Mon May 2 10:19:24 2011 (r3704)
@@ -80,6 +80,7 @@
namespace Uml
{
+ using namespace std;
// Get the other end of two-legged Uml classes
UDM_DLL const AssociationRole theOther(const AssociationRole &role);
UDM_DLL const CompositionChildRole theOther(const CompositionParentRole &role);
Modified: UDM/trunk/src/UML GME/Interpreter/AttributeObject.cpp
==============================================================================
--- UDM/trunk/src/UML GME/Interpreter/AttributeObject.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UML GME/Interpreter/AttributeObject.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -26,7 +26,7 @@
#include "StringBuffer.h"
-
+using namespace std;
bool isTypeSpec(const std::string str)
{
Modified: UDM/trunk/src/UML GME/Interpreter/BONComponent.cpp
==============================================================================
--- UDM/trunk/src/UML GME/Interpreter/BONComponent.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UML GME/Interpreter/BONComponent.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -126,13 +126,8 @@
char* GetRelativeFilename(const char *currentDirectory,const char *absoluteFilename);
CComponent *CComponent::theInstance = 0;
-#ifdef _DEBUG
-#define DLL_NAME "UML2XMLD.dll"
-#else
-#define DLL_NAME "UML2XML.dll"
-#endif
-
+using namespace std;
//////////////////////////////// CComponent //////////////////////////////////
Modified: UDM/trunk/src/Udm/Udm.h
==============================================================================
--- UDM/trunk/src/Udm/Udm.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/Udm/Udm.h Mon May 2 10:19:24 2011 (r3704)
@@ -20,6 +20,7 @@
#include <UdmDom.h>
#include <UmlExt.h>
+using namespace std;
struct UdmOpts {
// output mode
Modified: UDM/trunk/src/Udm/UdmCpp.cpp
==============================================================================
--- UDM/trunk/src/Udm/UdmCpp.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/Udm/UdmCpp.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -401,6 +401,7 @@
if (!opts.ns_map.empty() && !opts.integrate_xsd)
r.push_back( boost::format("#include <UdmDom.h>") );
+ r.push_back( boost::format("using namespace std;") );
r.push_back( boost::format("") );
if (cross_dgr && cross_dgr != diagram)
Modified: UDM/trunk/src/UdmBackendDump/BackendDump.cpp
==============================================================================
--- UDM/trunk/src/UdmBackendDump/BackendDump.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmBackendDump/BackendDump.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -7,6 +7,8 @@
#include "BackendDump.h"
+using namespace std;
+
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
Modified: UDM/trunk/src/UdmBackendDump/BackendDump.h
==============================================================================
--- UDM/trunk/src/UdmBackendDump/BackendDump.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmBackendDump/BackendDump.h Mon May 2 10:19:24 2011 (r3704)
@@ -23,10 +23,10 @@
class CBackendDump
{
-ostream* dump;
+std::ostream* dump;
public:
- CBackendDump(){dump=&cout;};
- CBackendDump(ostream*);
+ CBackendDump(){dump=&std::cout;};
+ CBackendDump(std::ostream*);
virtual ~CBackendDump();
Modified: UDM/trunk/src/UdmBackendDump/UdmBackendDump.cpp
==============================================================================
--- UDM/trunk/src/UdmBackendDump/UdmBackendDump.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmBackendDump/UdmBackendDump.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -23,7 +23,7 @@
{
if(argc!=3)
{
- cout<<"UdmBackendDump <backend_file.mga>|<backend_file.xml> <backend_meta_file.xml>"<<endl;
+ std::cout<<"UdmBackendDump <backend_file.mga>|<backend_file.xml> <backend_meta_file.xml>"<<std::endl;
return -1;
}
@@ -55,7 +55,7 @@
// Dump to string - for Windows GUI Applications
{
- stringstream strout;
+ std::stringstream strout;
CBackendDump dmp(&strout);
dmp.Dump(&sdnBackend);
//strout.rdbuf()->freeze(0);
Modified: UDM/trunk/src/UdmBase/DTDGen.h
==============================================================================
--- UDM/trunk/src/UdmBase/DTDGen.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmBase/DTDGen.h Mon May 2 10:19:24 2011 (r3704)
@@ -13,6 +13,7 @@
namespace DTDGen
{
+ using namespace std;
typedef pair<__int64, __int64> card_prod; //cardinality specification: min, max
typedef pair< ::Uml::Class, card_prod> class_w_cp; //class with cardinality prod
typedef vector<class_w_cp> cwcp_order; //list of classes with cardinality info
Modified: UDM/trunk/src/UdmBase/UdmProject.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmBase/UdmProject.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file UdmProject.cpp
// generated from diagram UdmProject
-// generated on Mon Mar 07 10:31:53 2011
+// generated on Mon May 02 10:02:17 2011
#include "UdmProject.h"
#include <UmlExt.h>
@@ -8,6 +8,7 @@
#include <UdmDom.h>
#include "UdmProject_xsd.h"
+using namespace std;
namespace UdmProject {
Modified: UDM/trunk/src/UdmBase/UdmProject_xsd.h
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject_xsd.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmBase/UdmProject_xsd.h Mon May 2 10:19:24 2011 (r3704)
@@ -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 Mon Mar 07 10:31:53 2011 -->\n";
+// str +="<!-- generated on Mon May 02 10:02:17 2011 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"DatanetworkType\">\n";
Modified: UDM/trunk/src/UdmGme/GmeObject.h
==============================================================================
--- UDM/trunk/src/UdmGme/GmeObject.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmGme/GmeObject.h Mon May 2 10:19:24 2011 (r3704)
@@ -30,7 +30,7 @@
#ifndef MOBIES_GME_OBJECT_H
#define MOBIES_GME_OBJECT_H
-
+using namespace std;
namespace UdmGme
{
Modified: UDM/trunk/src/UdmGme/MgaDefs.h
==============================================================================
--- UDM/trunk/src/UdmGme/MgaDefs.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmGme/MgaDefs.h Mon May 2 10:19:24 2011 (r3704)
@@ -42,7 +42,7 @@
{
char excbuf[20];
public:
- gme_exc(long l) : udm_exception(string("GME error: ")+ _ltoa(l, excbuf, 16)) { ; }
+ gme_exc(long l) : udm_exception(std::string("GME error: ")+ _ltoa(l, excbuf, 16)) { ; }
};
Modified: UDM/trunk/src/UdmOcl/UdmOclType.cpp
==============================================================================
--- UDM/trunk/src/UdmOcl/UdmOclType.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmOcl/UdmOclType.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -38,6 +38,8 @@
#include "UmlExt.h"
#include "UdmOcl.h"
+using namespace std;
+
namespace UmlOcl
{
Modified: UDM/trunk/src/UdmOclPat/UDMPat.cpp
==============================================================================
--- UDM/trunk/src/UdmOclPat/UDMPat.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmOclPat/UDMPat.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -12,6 +12,8 @@
UDM_USE_MGA
#endif
+using namespace std;
+
void dummy(void) {; }
int main(int argc, char **argv) {
Modified: UDM/trunk/src/UdmPython/UdmPython.cpp
==============================================================================
--- UDM/trunk/src/UdmPython/UdmPython.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmPython/UdmPython.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -13,6 +13,7 @@
#undef max
using namespace boost::python;
+using namespace std;
void SDN_OpenExisting(Udm::SmartDataNetwork& self, const string &systemname, const string& metalocator) {
self.OpenExisting(systemname, metalocator, Udm::CHANGES_LOST_DEFAULT);
Modified: UDM/trunk/src/UdmViz/UdmViz.cpp
==============================================================================
--- UDM/trunk/src/UdmViz/UdmViz.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmViz/UdmViz.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -11,7 +11,7 @@
{
if(argc!=3 && argc!=4)
{
- cout<<"UdmViz <backend_file> <backend_meta_file> [-<a>|<l><al>]"<<endl;
+ std::cout<<"UdmViz <backend_file> <backend_meta_file> [-<a>|<l><al>]"<<std::endl;
return -1;
}
@@ -66,7 +66,7 @@
}
catch(udm_exception &exc)
{
- cout<<"Exception occurred: "<<exc.what()<<endl;
+ std::cerr<<"Exception occurred: "<<exc.what()<<std::endl;
}
return 0;
Modified: UDM/trunk/src/UdmViz/UdmVizDump.cpp
==============================================================================
--- UDM/trunk/src/UdmViz/UdmVizDump.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmViz/UdmVizDump.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -6,6 +6,8 @@
#include "UmlExt.h"
#include "UdmUtil.h"
+using namespace std;
+
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
Modified: UDM/trunk/src/UdmViz/UdmVizDump.h
==============================================================================
--- UDM/trunk/src/UdmViz/UdmVizDump.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/UdmViz/UdmVizDump.h Mon May 2 10:19:24 2011 (r3704)
@@ -34,7 +34,7 @@
UdmVizDump();
virtual ~UdmVizDump();
- set<long> objectIDSet;
+ std::set<long> objectIDSet;
bool bAggregate;
bool bLinks;
Modified: UDM/trunk/src/Uml/Uml.cpp
==============================================================================
--- UDM/trunk/src/Uml/Uml.cpp Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/Uml/Uml.cpp Mon May 2 10:19:24 2011 (r3704)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file Uml.cpp
// generated from diagram Uml
-// generated on Mon Mar 07 10:31:53 2011
+// generated on Mon May 02 10:02:54 2011
#include "Uml.h"
#include <UmlExt.h>
@@ -8,6 +8,7 @@
#include <UdmDom.h>
#include "Uml_xsd.h"
+using namespace std;
namespace Uml {
Modified: UDM/trunk/src/Uml/Uml.h
==============================================================================
--- UDM/trunk/src/Uml/Uml.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/Uml/Uml.h Mon May 2 10:19:24 2011 (r3704)
@@ -2,7 +2,7 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.27 on Mon Mar 07 10:31:53 2011
+// generated with Udm version 3.27 on Mon May 02 10:03:39 2011
#include <UdmBase.h>
Modified: UDM/trunk/src/Uml/Uml.xsd
==============================================================================
--- UDM/trunk/src/Uml/Uml.xsd Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/Uml/Uml.xsd Mon May 2 10:19:24 2011 (r3704)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Mon Mar 07 10:31:53 2011 -->
+<!-- generated on Mon May 02 10:02:54 2011 -->
<xsd:complexType name="CompositionChildRoleType">
Modified: UDM/trunk/src/Uml/Uml_xsd.h
==============================================================================
--- UDM/trunk/src/Uml/Uml_xsd.h Mon May 2 10:15:34 2011 (r3703)
+++ UDM/trunk/src/Uml/Uml_xsd.h Mon May 2 10:19:24 2011 (r3704)
@@ -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 Mon Mar 07 10:31:53 2011 -->\n";
+// str +="<!-- generated on Mon May 02 10:02:54 2011 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"CompositionChildRoleType\">\n";
More information about the Mobies-commit
mailing list