[Mobies-commit] [commit] r4210 - in UDM/trunk: include src/UdmDom src/UdmOcl src/UdmOclPat/GOCL/Include src/UdmOclPat/GOCL/src src/UdmUtil
endre at redhat3.isis.vanderbilt.edu
endre at redhat3.isis.vanderbilt.edu
Sun Dec 8 03:36:53 CST 2013
Author: endre
Date: Sun Dec 8 03:36:53 2013
New Revision: 4210
Log:
MAC OS X compile issues (2)
Modified:
UDM/trunk/include/UdmBase.h
UDM/trunk/include/UdmStatic.h
UDM/trunk/src/UdmDom/UdmDom.cpp
UDM/trunk/src/UdmOcl/UdmOcl.cpp
UDM/trunk/src/UdmOcl/UdmOclObject.cpp
UDM/trunk/src/UdmOcl/UdmOclType.cpp
UDM/trunk/src/UdmOclPat/GOCL/Include/OCLContext.h
UDM/trunk/src/UdmOclPat/GOCL/Include/OCLTree.h
UDM/trunk/src/UdmOclPat/GOCL/src/OCLConstraint.cpp
UDM/trunk/src/UdmOclPat/GOCL/src/OCLTree.cpp
UDM/trunk/src/UdmUtil/UdmUtil.cpp
Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/include/UdmBase.h Sun Dec 8 03:36:53 2013 (r4210)
@@ -305,6 +305,7 @@
virtual ObjectImpl *clone() = 0;
virtual void release() = 0;
virtual DataNetwork *__getdn() = 0;
+ virtual ~ObjectImpl() {};
// --- type
@@ -611,7 +612,7 @@
static udm_exception e;
public:
- inline NullObject();
+ inline NullObject();
// in Object::Object(...) we assume this refererence counting behaviour
virtual ObjectImpl *clone() { return this; }
virtual void release() { }
@@ -699,8 +700,8 @@
extern UDM_DLL NullObject _null;
- inline NullObject::NullObject() { UDM_ASSERT(this == &_null); }
-
+ inline NullObject::NullObject() { UDM_ASSERT(this == &_null); }
+
extern UDM_DLL const ::Uml::CompositionChildRole NULLCHILDROLE;
extern UDM_DLL const ::Uml::CompositionParentRole NULLPARENTROLE;
@@ -4117,7 +4118,7 @@
#define UDM_USE_MGA
#endif
#else
-#define UDM_USE_DOM namespace UdmDom{extern UDM_DLL int DummyFL;static int *Dummy_For_Linker = &DummyFL; static struct _use_var{_use_var(){Dummy_For_Linker++;}} __unused;};
+#define UDM_USE_DOM namespace UdmDom{extern UDM_DLL int DummyFL;static int *Dummy_For_Linker = &DummyFL; struct _use_var{_use_var(){Dummy_For_Linker++;}} __unused;};
#endif
Modified: UDM/trunk/include/UdmStatic.h
==============================================================================
--- UDM/trunk/include/UdmStatic.h Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/include/UdmStatic.h Sun Dec 8 03:36:53 2013 (r4210)
@@ -80,7 +80,7 @@
if (!found)
{
- TYPENAME std::multimap<T, Z>::iterator inserted_at = insert(item);
+ TYPENAME std::multimap<T, Z>::iterator inserted_at = this->insert(item);
return TYPENAME std::pair<TYPENAME std::multimap<T, Z>::iterator,bool> (inserted_at, true);
}
return TYPENAME std::pair<TYPENAME std::multimap<T, Z>::iterator,bool>(this->end(), false);
Modified: UDM/trunk/src/UdmDom/UdmDom.cpp
==============================================================================
--- UDM/trunk/src/UdmDom/UdmDom.cpp Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmDom/UdmDom.cpp Sun Dec 8 03:36:53 2013 (r4210)
@@ -1437,10 +1437,12 @@
::Uml::CompositionChildRole chr = comp.childRole();
string ret = chr.name();
if(ret.empty())
+ {
if (::Uml::IsCrossNSComposition(comp))
ret = ((::Uml::Class) chr.target()).getPath2("_", false);
else
ret = ((::Uml::Class) chr.target()).name();
+ }
return ret;
}
@@ -1756,10 +1758,12 @@
}
if (!inserted)
+ {
if (insert_point != NULL)
aa.dom_element->insertBefore(dom_element, insert_point);
else
aa.dom_element->appendChild(dom_element);
+ }
}
Modified: UDM/trunk/src/UdmOcl/UdmOcl.cpp
==============================================================================
--- UDM/trunk/src/UdmOcl/UdmOcl.cpp Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmOcl/UdmOcl.cpp Sun Dec 8 03:36:53 2013 (r4210)
@@ -26,6 +26,7 @@
char *_itoa( int value, char *string, int radix )
{
sprintf(string, "%d", value);
+ return string;
};
#endif
@@ -629,6 +630,8 @@
case ENT_ALL :
strErrAll += LINE_END + strErr;
break;
+ default:
+ break;
}
bResult = false;
@@ -652,7 +655,8 @@
case ENT_ALL :
strErrAll += LINE_END + strErr;
break;
- }
+ default:
+ break; }
bResult = false;
}
else
@@ -692,6 +696,8 @@
case ENT_ALL :
strErrAll += LINE_END + strErr;
break;
+ default:
+ break;
}
bResult = false;
}
@@ -769,6 +775,8 @@
case ENT_ALL :
strErrAll += LINE_END + strErr;
break;
+ default:
+ break;
}
bResult = false;
}
@@ -922,6 +930,8 @@
case ENT_ALL :
strErrAll += LINE_END + strErr;
break;
+ default:
+ break;
}
eResult = CER_UNDEFINED;
}
@@ -936,6 +946,8 @@
case CER_UNDEFINED :
eResult = CER_UNDEFINED;
break;
+ default:
+ break;
}
}
catch ( const udm_exception& ex ) {
@@ -946,6 +958,8 @@
case ENT_ALL :
strErrAll += LINE_END + (std::string) ex.what();
break;
+ default:
+ break;
}
}
}
@@ -971,6 +985,8 @@
case ENT_ALL :
strErrAll += LINE_END + (std::string) ex.what();
break;
+ default:
+ break;
}
}
@@ -986,6 +1002,8 @@
case CER_UNDEFINED :
eResult = CER_UNDEFINED;
break;
+ default:
+ break;
}
} catch ( const udm_exception& ex ) {
switch ( options.sErrorNotification.eExceptionKind ) {
@@ -995,6 +1013,8 @@
case ENT_ALL :
strErrAll += LINE_END + (std::string) ex.what();
break;
+ default:
+ break;
}
}
}
Modified: UDM/trunk/src/UdmOcl/UdmOclObject.cpp
==============================================================================
--- UDM/trunk/src/UdmOcl/UdmOclObject.cpp Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmOcl/UdmOclObject.cpp Sun Dec 8 03:36:53 2013 (r4210)
@@ -36,6 +36,7 @@
char *_ltoa( long value, char *string, int radix )
{
sprintf(string, "%ld", value);
+ return string;
};
#endif
Modified: UDM/trunk/src/UdmOcl/UdmOclType.cpp
==============================================================================
--- UDM/trunk/src/UdmOcl/UdmOclType.cpp Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmOcl/UdmOclType.cpp Sun Dec 8 03:36:53 2013 (r4210)
@@ -353,7 +353,7 @@
::Uml::Class child = childRole.target();
std::string strClass = child.name();
- if ( ! strRole.empty() && strRole == strName || strName == ::UdmOcl::LowerFirst( strClass ) ) {
+ if ( (! strRole.empty() && strRole == strName) || (strName == ::UdmOcl::LowerFirst( strClass )) ) {
TypeSeq vecType;
if ( childRole.max() > 1 || childRole.max() == -1 )
vecType.push_back( "ocl::Set" );
@@ -383,7 +383,7 @@
std::string strRole = (*itTo).name();
::Uml::Class peer = (*itTo).target();
std::string strClass = peer.name();
- if ( ! strRole.empty() && strRole == strName || strRole.empty() && strName == ::UdmOcl::LowerFirst( strClass ) ) {
+ if ( (! strRole.empty() && strRole == strName) || (strRole.empty() && strName == ::UdmOcl::LowerFirst( strClass )) ) {
TypeSeq vecType;
if ( (*itTo).max() > 1 || (*itTo).max() == -1 )
vecType.push_back( "ocl::Set" );
@@ -409,7 +409,7 @@
std::string strClass = assocClass.name();
std::string strRole = (*itFrom).name();
std::string strClassRole = ::UdmOcl::LowerFirst( strClass );
- if ( strAcceptable.empty() && strClassRole == strName || ! strAcceptable.empty() && ! strRole.empty() && strRole == strName && strAcceptable == strClassRole ) {
+ if ( (strAcceptable.empty() && strClassRole == strName) || (! strAcceptable.empty() && ! strRole.empty() && strRole == strName && strAcceptable == strClassRole )) {
set< ::Uml::AssociationRole> setToRoles = association.roles();
TypeSeq vecType;
set< ::Uml::AssociationRole>::iterator itTo;
@@ -442,7 +442,7 @@
::Uml::Class target = (*it).target();
std::string strClass = target.name();
std::string strRole = (*it).name();
- if ( ! strRole.empty() && strRole == strName || strRole.empty() && strName == ::UdmOcl::LowerFirst( strClass ) ) {
+ if ( (! strRole.empty() && strRole == strName) || (strRole.empty() && strName == ::UdmOcl::LowerFirst( strClass ) )) {
TypeSeq vecType( 1, ::UdmOcl::GetQualifiedName( target ) );
vecFeatures.push_back( new OclMeta::Association( strName, "", vecType, new TObjectDerived_Targets( *it ), true ) );
}
Modified: UDM/trunk/src/UdmOclPat/GOCL/Include/OCLContext.h
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/Include/OCLContext.h Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmOclPat/GOCL/Include/OCLContext.h Sun Dec 8 03:36:53 2013 (r4210)
@@ -281,7 +281,7 @@
bool AddVariable( const std::string& strName, const TItem& object, bool bAssignable = false, bool bRedefine = false )
{
- if ( bRedefine && ! m_vecContexts[ m_vecContexts.size() - 1 ].ExistsVariable( strName ) || ! ExistsVariable( strName ) ) {
+ if ( (bRedefine && ! m_vecContexts[ m_vecContexts.size() - 1 ].ExistsVariable( strName )) || ! ExistsVariable( strName ) ) {
m_vecContexts[ m_vecContexts.size() - 1 ].AddVariable( strName, object, bAssignable );
return true;
}
Modified: UDM/trunk/src/UdmOclPat/GOCL/Include/OCLTree.h
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/Include/OCLTree.h Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmOclPat/GOCL/Include/OCLTree.h Sun Dec 8 03:36:53 2013 (r4210)
@@ -735,7 +735,11 @@
TreeNodeVector m_vecNodes;
EnumerationNode( TreeManager* pManager );
~EnumerationNode();
- virtual std::string Print( const std::string& strTabs ) const { return "Enumeration Node - size: " + m_vecNodes.size(); };
+ virtual std::string Print( const std::string& strTabs ) const {
+ char ret[50];
+ sprintf(ret, "Enumeration Node - size: %lu", m_vecNodes.size() );
+ return ret;
+ };
virtual bool CheckImplementation( TypeContext& context );
virtual OclMeta::Object Evaluate( ObjectContext& context );
};
Modified: UDM/trunk/src/UdmOclPat/GOCL/src/OCLConstraint.cpp
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/src/OCLConstraint.cpp Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmOclPat/GOCL/src/OCLConstraint.cpp Sun Dec 8 03:36:53 2013 (r4210)
@@ -77,7 +77,7 @@
Constraint::State Constraint::Define( const std::string& strName, const std::string& strText, bool bDynamic )
{
- if ( ! strName.empty() || ! strText.empty() && m_eState <= CS_DEFINED ) {
+ if ( ! strName.empty() || (! strText.empty() && m_eState <= CS_DEFINED) ) {
m_bDynamic = bDynamic;
if ( ! strName.empty() )
m_strName = strName;
Modified: UDM/trunk/src/UdmOclPat/GOCL/src/OCLTree.cpp
==============================================================================
--- UDM/trunk/src/UdmOclPat/GOCL/src/OCLTree.cpp Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmOclPat/GOCL/src/OCLTree.cpp Sun Dec 8 03:36:53 2013 (r4210)
@@ -240,7 +240,7 @@
return feature2;
vecAmbiguities[ 1 ] = 0;
- if ( feature1 || ! feature1 && exception.GetCode() == vecAmbiguities[ 0 ] ) {
+ if ( feature1 || (! feature1 && exception.GetCode() == vecAmbiguities[ 0 ] )) {
if ( feature1 )
vecAmbiguities[ 0 ] = 0;
POOLADDEX(exAmbiguity, OclCommon::Exception( OclCommon::Exception::ET_SEMANTIC, vecAmbiguities[ 2 ], vecSignatures[ 0 ]->Print(), vecSignatures[ 1 ]->Print() ) );
@@ -256,7 +256,7 @@
}
if ( ex.GetCode() == vecAmbiguities[ 1 ] ) {
- if ( feature1 || ! feature1 && exception.GetCode() == vecAmbiguities[ 0 ] ) {
+ if ( feature1 || (! feature1 && exception.GetCode() == vecAmbiguities[ 0 ] )) {
if ( feature1 )
vecAmbiguities[ 0 ] = 0;
POOLADDEX(exAmbiguity, OclCommon::Exception( OclCommon::Exception::ET_SEMANTIC, vecAmbiguities[ 2 ], vecSignatures[ 0 ]->Print(), vecSignatures[ 1 ]->Print() ) );
@@ -320,8 +320,8 @@
context.vecViolations.push_back( violation );
context.iViolationCount++;
- if ( violation.bIsException )
- context.m_bHasException;
+ //if ( violation.bIsException )
+ // context.m_bHasException;
}
// terge
@@ -330,8 +330,8 @@
context.vecViolations.push_back( violation );
context.iViolationCount++;
- if ( violation.bIsException )
- context.m_bHasException;
+ //if ( violation.bIsException )
+ // context.m_bHasException;
}
bool TreeNode::IsBooleanReturned()
@@ -1050,7 +1050,7 @@
// Evaluation of any kind of operators
- if ( spOperand1.IsUndefined() || m_pOperandNode2 && spOperand2.IsUndefined() )
+ if ( spOperand1.IsUndefined() || (m_pOperandNode2 && spOperand2.IsUndefined()) )
return OclMeta::Object::UNDEFINED;
EVALTRY {
@@ -1251,7 +1251,7 @@
// Check Argument
- bool bArgumentValid = m_bTester && ! m_pArgumentNode->m_vecType.empty() || ! m_vecTypeDecl.empty() && m_pArgumentNode->Check( context );
+ bool bArgumentValid = (m_bTester && ! m_pArgumentNode->m_vecType.empty() )|| (! m_vecTypeDecl.empty() && m_pArgumentNode->Check( context ));
// Check if Iterator exists
@@ -1587,7 +1587,7 @@
m_pIterator->m_pThisNode = m_pThisNode;
m_pIterator->m_strCallOperator = "->";
m_pIterator->m_strName = m_strName;
- m_pIterator->m_vecDeclarators;
+ //m_pIterator->m_vecDeclarators;
m_pIterator->m_mapPositions = m_mapPositions;
m_pIterator->m_pArgumentNode = m_vecArguments[ 0 ];
@@ -1631,7 +1631,7 @@
m_pIterator->m_pThisNode = m_pThisNode;
m_pIterator->m_strCallOperator = "->";
m_pIterator->m_strName = m_strName;
- m_pIterator->m_vecDeclarators;
+ //m_pIterator->m_vecDeclarators;
m_pIterator->m_mapPositions = m_mapPositions;
m_pIterator->m_pArgumentNode = m_vecArguments[ 0 ];
Modified: UDM/trunk/src/UdmUtil/UdmUtil.cpp
==============================================================================
--- UDM/trunk/src/UdmUtil/UdmUtil.cpp Sun Dec 8 03:36:42 2013 (r4209)
+++ UDM/trunk/src/UdmUtil/UdmUtil.cpp Sun Dec 8 03:36:53 2013 (r4210)
@@ -1054,6 +1054,7 @@
#endif // if defined(HAVE_DLFCN_H)
#else // if defined(HAVE_EXECINFO_H)
+ #if defined(_WIN32)
vector<string> get_symbols()
{
@@ -1113,12 +1114,13 @@
return res;
}
-
+ #endif //if defined (_WIN32)
#endif // if defined(HAVE_EXECINFO_H)
UDM_DLL string stacktrace()
{
string trace = "Call stack:\n";
+ vector<string> v;
#if defined(HAVE_EXECINFO_H)
@@ -1126,10 +1128,10 @@
void *stack_addrs[64];
size_t stack_depth = backtrace(stack_addrs, 64);
- vector<string> v = get_symbols(stack_addrs, stack_depth);
+ v = get_symbols(stack_addrs, stack_depth);
#elif defined(_WIN32)
- vector<string> v = get_symbols();
+ v = get_symbols();
#endif // defined(HAVE_EXECINFO_H)
for (size_t i = 0; i < v.size(); i++)
More information about the Mobies-commit
mailing list