[Mobies-commit] [commit] r3696 - in UDM/trunk: include src/Udm src/UdmBase src/UdmDom src/UdmGme src/UdmUtil src/Uml
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Fri Apr 29 16:13:44 CDT 2011
Author: ksmyth
Date: Fri Apr 29 16:13:44 2011
New Revision: 3696
Log:
Define UDM_ASSERT instead of ASSERT to avoid name clashes
Modified:
UDM/trunk/include/ErrHand.h
UDM/trunk/include/UdmBase.h
UDM/trunk/src/Udm/ClassGen.cpp
UDM/trunk/src/Udm/DiagramGen.cpp
UDM/trunk/src/Udm/Udm.h
UDM/trunk/src/UdmBase/DTDGen.cpp
UDM/trunk/src/UdmBase/UdmBase.cpp
UDM/trunk/src/UdmBase/UdmProject.cpp
UDM/trunk/src/UdmBase/UdmStatic.cpp
UDM/trunk/src/UdmBase/UmlExt.cpp
UDM/trunk/src/UdmDom/UdmDom.cpp
UDM/trunk/src/UdmGme/MgaDefs.h
UDM/trunk/src/UdmGme/UdmGme.cpp
UDM/trunk/src/UdmUtil/UdmUtil.cpp
UDM/trunk/src/Uml/Uml.cpp
Modified: UDM/trunk/include/ErrHand.h
==============================================================================
--- UDM/trunk/include/ErrHand.h Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/include/ErrHand.h Fri Apr 29 16:13:44 2011 (r3696)
@@ -24,9 +24,7 @@
#endif
#endif
-#ifndef ASSERT
-#define ASSERT assert
-#endif
+#define UDM_ASSERT(x) assert(x)
#include <exception>
#include <string>
Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/include/UdmBase.h Fri Apr 29 16:13:44 2011 (r3696)
@@ -673,7 +673,7 @@
extern UDM_DLL NullObject _null;
- inline NullObject::NullObject() { ASSERT(this == &_null); }
+ inline NullObject::NullObject() { UDM_ASSERT(this == &_null); }
extern UDM_DLL const ::Uml::CompositionChildRole NULLCHILDROLE;
extern UDM_DLL const ::Uml::CompositionParentRole NULLPARENTROLE;
@@ -2044,7 +2044,7 @@
operator CLASS() const
{
vector<ObjectImpl*> a = impl->getAssociation(meta);
- ASSERT( a.size() <= 1 );
+ UDM_ASSERT( a.size() <= 1 );
// TODO: assert the type of the object
return a.empty() ? &_null : a.front();
@@ -2111,7 +2111,7 @@
operator CLASS() const
{
vector<ObjectImpl*> a = impl->getAssociation(meta, TARGETFROMCLASS);
- ASSERT( a.size() <= 1 );
+ UDM_ASSERT( a.size() <= 1 );
// TODO: assert the type of the object
return a.empty() ? &_null : a.front();
@@ -2180,7 +2180,7 @@
operator CLASS() const
{
vector<ObjectImpl*> a = impl->getAssociation(peermeta, CLASSFROMTARGET);
- ASSERT( a.size() <= 1 );
+ UDM_ASSERT( a.size() <= 1 );
// TODO: assert the type of the object
return a.empty() ? &_null : a.front();
@@ -2443,7 +2443,7 @@
operator CLASS() const
{
vector<ObjectImpl*> a = impl->getChildren(meta, CLASS::meta);
- ASSERT( a.size() <= 1 );
+ UDM_ASSERT( a.size() <= 1 );
// TODO: assert the type of the object
return a.empty() ? &_null : a.front();
@@ -2489,7 +2489,7 @@
const CLASS &operator =(const CLASS &a)
{
// CYT4 - to allow the effective removal of node by setting parent to null
-// ASSERT( a != null );
+// UDM_ASSERT( a != null );
impl->setParent(a.__impl(), meta);
@@ -2589,7 +2589,7 @@
operator RESULTTYPE() const
{
vector<ObjectImpl*> a = impl->getAssociation(meta, TARGETFROMCLASS);
- ASSERT( a.size() <= 1 );
+ UDM_ASSERT( a.size() <= 1 );
if (!a.empty())
{
@@ -2637,7 +2637,7 @@
AssocEndChainAttr<CLASS, RESULTTYPE> &disconnect()
{
vector<ObjectImpl*> a = impl->getAssociation(meta, TARGETFROMCLASS);
- ASSERT( a.size() <= 1 );
+ UDM_ASSERT( a.size() <= 1 );
if (!a.empty())
{
@@ -2675,12 +2675,12 @@
// --- construction
public:
- Object() : impl(&_null) { ASSERT(impl != NULL); }
- Object(ObjectImpl *i) : impl(i != NULL ? i : &_null) { ASSERT(impl != NULL); }
+ Object() : impl(&_null) { UDM_ASSERT(impl != NULL); }
+ Object(ObjectImpl *i) : impl(i != NULL ? i : &_null) { UDM_ASSERT(impl != NULL); }
- Object(const Object &a) : impl(a.impl->clone()) { ASSERT(impl != NULL); }
+ Object(const Object &a) : impl(a.impl->clone()) { UDM_ASSERT(impl != NULL); }
#ifdef UDM_RVALUE
- Object(Object&& a) : impl(a.impl) { ASSERT(impl != NULL); a.impl = NULL; }
+ Object(Object&& a) : impl(a.impl) { UDM_ASSERT(impl != NULL); a.impl = NULL; }
#endif
~Object()
{
@@ -2688,7 +2688,7 @@
if (impl)
#endif
{
- ASSERT(impl != NULL);
+ UDM_ASSERT(impl != NULL);
impl->release();
#ifdef _DEBUG
impl = NULL;
@@ -2699,10 +2699,10 @@
const Object &operator =(const Object &a)
{
- ASSERT(a.impl != NULL);
+ UDM_ASSERT(a.impl != NULL);
ObjectImpl *t = a.impl->clone();
- ASSERT(impl != NULL);
+ UDM_ASSERT(impl != NULL);
impl->release();
impl = t;
Modified: UDM/trunk/src/Udm/ClassGen.cpp
==============================================================================
--- UDM/trunk/src/Udm/ClassGen.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/Udm/ClassGen.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -919,7 +919,7 @@
for( set< ::Uml::AssociationRole>::iterator i = assocs.begin(); i != assocs.end(); i++)
{
string rel_name = ::Uml::MakeRoleName(*i);
- ASSERT(rel_name.size() > 0);
+ UDM_ASSERT(rel_name.size() > 0);
::Uml::AssociationRole the_other = ::Uml::theOther(*i);
string orel_name = ::Uml::MakeRoleName(the_other);
Modified: UDM/trunk/src/Udm/DiagramGen.cpp
==============================================================================
--- UDM/trunk/src/Udm/DiagramGen.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/Udm/DiagramGen.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -108,7 +108,7 @@
meth_defs.push_back( boost::format("\t%1%::Initialize();") % (string) cross_diagram.name() );
meth_defs.push_back( boost::format("\n\
-\t\tASSERT( meta == Udm::null );\n\
+\t\tUDM_ASSERT( meta == Udm::null );\n\
")
);
@@ -193,7 +193,7 @@
\t}\n\
")
% gen.opts.macro
- % (cross_diagram && (cross_diagram != c) ? "ASSERT(::" + (string) cross_diagram.name() + "::meta != Udm::null);" : "")
+ % (cross_diagram && (cross_diagram != c) ? "UDM_ASSERT(::" + (string) cross_diagram.name() + "::meta != Udm::null);" : "")
% (uri_mapping_stmts.size() ? "_SetURIMapping();" : "")
% (xsd_storage_stmts.size() ? "_SetXsdStorage();" : "")
);
Modified: UDM/trunk/src/Udm/Udm.h
==============================================================================
--- UDM/trunk/src/Udm/Udm.h Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/Udm/Udm.h Fri Apr 29 16:13:44 2011 (r3696)
@@ -451,7 +451,7 @@
corba_init.push_back( boost::format("::Uml::InitCORBAAssociation(ass, meta, \"%1%\")") % (string) a.name() );
set< ::Uml::AssociationRole> roles = a.roles();
- ASSERT(roles.size() == 2);
+ UDM_ASSERT(roles.size() == 2);
if (aclass)
{
Modified: UDM/trunk/src/UdmBase/DTDGen.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/DTDGen.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmBase/DTDGen.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -558,8 +558,8 @@
__int64 min = j->min();
__int64 max = j->max();
- ASSERT( 0 <= min );
- ASSERT( max == -1 || min <= max );
+ UDM_ASSERT( 0 <= min );
+ UDM_ASSERT( max == -1 || min <= max );
if( min == 1 && max == 1 )
output << "IDREF\t#REQUIRED" << endl;
@@ -880,8 +880,8 @@
__int64 min = j->min();
__int64 max = j->max();
- ASSERT( 0 <= min );
- ASSERT( max == -1 || min <= max );
+ UDM_ASSERT( 0 <= min );
+ UDM_ASSERT( max == -1 || min <= max );
if( min == 1 && max == 1 )
output << " type=\"xsd:IDREF\" use=\"required\"/>" << endl;
Modified: UDM/trunk/src/UdmBase/UdmBase.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmBase.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmBase/UdmBase.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -1263,7 +1263,7 @@
UDM_DLL ObjectImpl* ObjectImpl::AttachLibrary(ObjectImpl *lib_src, const string &lib_name, t_lib_to_copy_impl_map *copy_map)
{
- ASSERT(lib_name.length() > 0);
+ UDM_ASSERT(lib_name.length() > 0);
ObjectImpl *lib_root;
if (__getdn()->IsTypeSafe())
@@ -1692,7 +1692,7 @@
bool canCompleteRefsChain(const ObjectImpl* target, const vector<ObjectImpl*> &refs)
{
- ASSERT(refs.size());
+ UDM_ASSERT(refs.size());
ObjectImpl* ref = refs.back();
Modified: UDM/trunk/src/UdmBase/UdmProject.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmProject.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmBase/UdmProject.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -97,7 +97,7 @@
::Uml::Initialize();
- ASSERT( meta == Udm::null );
+ UDM_ASSERT( meta == Udm::null );
meta = ::Uml::CreateDiagram();
Modified: UDM/trunk/src/UdmBase/UdmStatic.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UdmStatic.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmBase/UdmStatic.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -4327,7 +4327,7 @@
StaticObject *parent = static_cast<StaticObject*>(p.__impl());
StaticObject *child = static_cast<StaticObject*>(c.__impl());
- ASSERT( child->m_parent == NULL );
+ UDM_ASSERT( child->m_parent == NULL );
child->refCount += 2;
child->m_parent = parent;
Modified: UDM/trunk/src/UdmBase/UmlExt.cpp
==============================================================================
--- UDM/trunk/src/UdmBase/UmlExt.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmBase/UmlExt.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -57,7 +57,7 @@
Association assoc = role.parent();
set<AssociationRole> roles = assoc.roles();
- ASSERT( roles.size() == 2 );
+ UDM_ASSERT( roles.size() == 2 );
set<AssociationRole>::iterator i = roles.begin();
if( *i == role )
@@ -433,7 +433,7 @@
UDM_DLL bool IsCrossNSAssociation(const Association &a)
{
set<AssociationRole> roles = a.roles();
- ASSERT( roles.size() == 2 );
+ UDM_ASSERT( roles.size() == 2 );
set<AssociationRole>::iterator i = roles.begin();
Class tg1 = i->target();
@@ -967,7 +967,7 @@
while (!dgr) {
dgr = p_ns.parent();
p_ns = p_ns.parent_ns();
- ASSERT(dgr || p_ns);
+ UDM_ASSERT(dgr || p_ns);
}
return dgr;
}
Modified: UDM/trunk/src/UdmDom/UdmDom.cpp
==============================================================================
--- UDM/trunk/src/UdmDom/UdmDom.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmDom/UdmDom.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -359,14 +359,14 @@
if (!a || !XMLString::stringLen(a)) return 0;
//this assertation failes
//we should take a look why is this invoked with empty string
- //ASSERT (a != 0);
+ //UDM_ASSERT (a != 0);
char *buf = XMLString::transcode(a);
char *endptr;
// start parsing after the "id" prefix
unsigned long retval = strtoul(buf + 2, &endptr, 16);
- ASSERT(*endptr == '\0');
+ UDM_ASSERT(*endptr == '\0');
XMLString::release(&buf);
@@ -751,7 +751,7 @@
static XMLCh* DSAppend(const XMLCh *src, const string &data)
{
- ASSERT(src != NULL);
+ UDM_ASSERT(src != NULL);
int ret_length = XMLString::stringLen(src) + 1 + data.length() + 1;
XMLCh *retval = (XMLCh*) XMLPlatformUtils::fgMemoryManager->allocate(ret_length * sizeof(XMLCh));
@@ -768,7 +768,7 @@
static XMLCh* DSAppend(const XMLCh *src, const XMLCh *data)
{
- ASSERT(src != NULL);
+ UDM_ASSERT(src != NULL);
int ret_length = XMLString::stringLen(src) + 1 + XMLString::stringLen(data) + 1;
XMLCh *retval = (XMLCh*) XMLPlatformUtils::fgMemoryManager->allocate(ret_length * sizeof(XMLCh));
@@ -781,7 +781,7 @@
static XMLCh *DSAppendTo(XMLCh **target, const XMLCh *data, bool releaseTarget = true)
{
- ASSERT(target != NULL);
+ UDM_ASSERT(target != NULL);
if (data == NULL)
return *target;
@@ -807,11 +807,11 @@
// remove from target the substring given by the parameters
static void DSRemoveSubstr(XMLCh *target, int startIndex, int count)
{
- ASSERT(target != NULL);
+ UDM_ASSERT(target != NULL);
int length = XMLString::stringLen(target);
- ASSERT(startIndex >= 0 && startIndex < length);
- ASSERT(count >= 0);
+ UDM_ASSERT(startIndex >= 0 && startIndex < length);
+ UDM_ASSERT(count >= 0);
if (startIndex + count >= length)
*(target + startIndex) = chNull;
@@ -1411,7 +1411,7 @@
if(e == NULL) e = ((DomDataNetwork*)mydn)->Search(p);
// the ID must exists
- ASSERT( e != NULL );
+ UDM_ASSERT( e != NULL );
const XMLCh *cpa = e->getAttribute(oname_buf);
if (EmptyVal(cpa))
@@ -1801,13 +1801,13 @@
}
XMLCh *ncomp_buf = XMLString::transcode(ncomp.c_str());
- ASSERT( XMLString::compareString(chas, ncomp_buf) == 0);
+ UDM_ASSERT( XMLString::compareString(chas, ncomp_buf) == 0);
XMLString::release(&ncomp_buf);
}
else
{
// Only a single compositionrole matches these two kinds
- ASSERT(comp == role.parent());
+ UDM_ASSERT(comp == role.parent());
}
//#endif
}
@@ -2407,7 +2407,7 @@
DOMElement *e = ((DomDataNetwork*)mydn)->Search(p);
// the ID must exists
- ASSERT( e != NULL );
+ UDM_ASSERT( e != NULL );
if (followattr.length() > 0) {
const XMLCh *a = getAttrValue(*e, followattr);
@@ -2418,7 +2418,7 @@
e = ee;
}
// the ID must exists
- ASSERT( e != NULL );
+ UDM_ASSERT( e != NULL );
// create the object
ret.push_back( new DomObject(/*m_type.parent(), */ e, mydn) );
@@ -2689,7 +2689,7 @@
DOMElement *e = ((DomDataNetwork*)mydn)->Search(p);
// the ID must exists
- ASSERT( e != NULL );
+ UDM_ASSERT( e != NULL );
const XMLCh *cpa = e->getAttribute(oname_buf);
if (EmptyVal(cpa))
@@ -2893,7 +2893,7 @@
DOMElement *e = ((DomDataNetwork*)mydn)->Search(p);
// the ID must exists
- ASSERT( e != NULL );
+ UDM_ASSERT( e != NULL );
// create the object
ret.push_back( new DomObject(/*m_type.parent(), */e, mydn) );
@@ -2920,7 +2920,7 @@
DOMElement *e = ((DomDataNetwork*)mydn)->Search(p);
// the ID must exists
- ASSERT( e != NULL );
+ UDM_ASSERT( e != NULL );
// create the object
ret.push_back( new DomObject(/*m_type.parent(), */e, mydn) );
@@ -2947,7 +2947,7 @@
DOMElement *e = ((DomDataNetwork*)mydn)->Search(a);
// the ID must exists
- ASSERT( e != NULL );
+ UDM_ASSERT( e != NULL );
// create the object
return new DomObject(/*m_type.parent(), */e, mydn);
@@ -3565,7 +3565,7 @@
IdToDomElementMapItem item_to_store(id, e);
pair<IdToDomElementMap::iterator, bool> ins_res;
ins_res = DomElements.insert(item_to_store);
- ASSERT( (!force) || (force && ins_res.second) );
+ UDM_ASSERT( (!force) || (force && ins_res.second) );
};
@@ -3642,7 +3642,7 @@
pair<IdToDomElementMap::iterator, bool> ins_res;
ins_res = DomElements.insert(item_to_store);
//check for uniqueness
- ASSERT(ins_res.second);
+ UDM_ASSERT(ins_res.second);
//set uniqueId to id
dd->setUserData(gXML__id, (void*) id, NULL);
@@ -3709,7 +3709,7 @@
str_based = true;
- ASSERT( str.length());
+ UDM_ASSERT( str.length());
parser->reset();
@@ -3759,7 +3759,7 @@
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc = parser->getDocument();
DOMElement *root = doc->getDocumentElement();
- ASSERT( root != NULL );
+ UDM_ASSERT( root != NULL );
//parser.getDocument().setUserData((void *)pp.load(systemname.c_str()));
@@ -3812,7 +3812,7 @@
TRY_XML_EXCEPTION
- ASSERT( systemname.length());
+ UDM_ASSERT( systemname.length());
parser->reset();
@@ -3864,7 +3864,7 @@
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc = parser->getDocument();
DOMElement *root = doc->getDocumentElement();
- ASSERT( root != NULL );
+ UDM_ASSERT( root != NULL );
//doc->setUserData((void *)pp.load(systemname.c_str()));
@@ -3951,7 +3951,7 @@
}
- ASSERT( metalocator.length());
+ UDM_ASSERT( metalocator.length());
savesystemname = systemname;
if(!strnicmp(savesystemname.c_str(),"DOM:", 4)) savesystemname.erase(0,4);
@@ -4050,7 +4050,7 @@
DOMElement *rootElem = doc->getDocumentElement();
- ASSERT( rootElem != NULL );
+ UDM_ASSERT( rootElem != NULL );
rootobject = new DomObject(/*GetRootMeta(),*/ rootElem, this);
@@ -4154,7 +4154,7 @@
DOMElement *de = static_cast<DomObject *>(GetRootObject().__impl())->dom_element;
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc = de->getOwnerDocument();
- ASSERT( doc != NULL);
+ UDM_ASSERT( doc != NULL);
MySerializer serializer(doc);
@@ -4193,7 +4193,7 @@
DOMElement *de = static_cast<DomObject *>(GetRootObject().__impl())->dom_element;
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc = de->getOwnerDocument();
- ASSERT( doc != NULL);
+ UDM_ASSERT( doc != NULL);
MySerializer serializer(doc);
XMLFormatTarget *file_target = new LocalFileFormatTarget(X(systemname));
@@ -4316,7 +4316,7 @@
TRY_XML_EXCEPTION
- ASSERT( systemname.length());
+ UDM_ASSERT( systemname.length());
/* savesystemname = systemname;
if(!strnicmp(savesystemname.c_str(),"DOM:", 4)) savesystemname.erase(0,4);*/
Modified: UDM/trunk/src/UdmGme/MgaDefs.h
==============================================================================
--- UDM/trunk/src/UdmGme/MgaDefs.h Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmGme/MgaDefs.h Fri Apr 29 16:13:44 2011 (r3696)
@@ -3,9 +3,6 @@
#define MOBIES_MGA_DEFS_H
#define SmartBSTR _bstr_t
-const SmartBSTR NULLBSTR;
-
-
//MGA macros
@@ -35,7 +32,7 @@
//so-called error handling
-void SetErrorInfo(long,unsigned short *) { ASSERT("NotYet Implemented"); }
+void SetErrorInfo(long,unsigned short *) { UDM_ASSERT("NotYet Implemented"); }
void comthrow(HRESULT res, char *e, int l);
#define COMTHROW(expr) comthrow(expr, #expr, __LINE__)
#define CASSERT(x) if(!(x)) COMTHROW( ((x), -1))
Modified: UDM/trunk/src/UdmGme/UdmGme.cpp
==============================================================================
--- UDM/trunk/src/UdmGme/UdmGme.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmGme/UdmGme.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -202,6 +202,7 @@
#pragma warning( disable : 4786 ) // this is the stupid warning with truncating identifiers to 255 chars
+#define ASSERT assert
#include "CommonHeaders.h"
#include <map>
#include <iomanip>
@@ -2387,7 +2388,7 @@
{
//position in main aspect will be set
IMgaPartPtr part = parts->Item[1];
- COMTHROW(part->SetGmeAttrs(NULLBSTR, poss.begin()->second.first,poss.begin()->second.second ));
+ COMTHROW(part->SetGmeAttrs(_bstr_t(), poss.begin()->second.first,poss.begin()->second.second ));
}
else
{
@@ -2399,7 +2400,7 @@
part_position::const_iterator poss_i = poss.find(aspect);
if ( poss_i != poss.end())
- COMTHROW(MGACOLL_ITER->SetGmeAttrs(NULLBSTR, poss_i->second.first,poss_i->second.second));
+ COMTHROW(MGACOLL_ITER->SetGmeAttrs(_bstr_t(), poss_i->second.first,poss_i->second.second));
} MGACOLL_ITERATE_END;
Modified: UDM/trunk/src/UdmUtil/UdmUtil.cpp
==============================================================================
--- UDM/trunk/src/UdmUtil/UdmUtil.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/UdmUtil/UdmUtil.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -799,7 +799,7 @@
int precision_is_good;
do {
- ASSERT(precision <= MAXIMAL_PRECISION);
+ UDM_ASSERT(precision <= MAXIMAL_PRECISION);
#ifdef _WIN32
if (_snprintf_s(result, 64, "%.*g", precision, val) < 0) {
Modified: UDM/trunk/src/Uml/Uml.cpp
==============================================================================
--- UDM/trunk/src/Uml/Uml.cpp Fri Apr 29 16:13:06 2011 (r3695)
+++ UDM/trunk/src/Uml/Uml.cpp Fri Apr 29 16:13:44 2011 (r3696)
@@ -496,7 +496,7 @@
::Uml::Initialize();
- ASSERT( meta == Udm::null );
+ UDM_ASSERT( meta == Udm::null );
meta = ::Uml::CreateDiagram();
More information about the Mobies-commit
mailing list