[Mobies-commit] [commit] r3711 - in GReAT/trunk: Libraries/Configuration Libraries/Engine Libraries/GRAPI Libraries/GRCC Libraries/RTT Tools/CodeGenerator/CG_console Tools/CodeGenerator/CG_interpreter Tools/CodeGenerator/CodeGenerator Tools/CodeGenerator/ConfigGenerator Tools/Debugger/GRD_interpreter Tools/Engine/GRE_Interpreter Tools/MetaGME2UMX Tools/MetaGME2UMX/LegacyUpdate Tools/MetaGME2UMX/MetaGME2UMX Interpreters Tools/UMTInterpreters/Blockify Tools/UMTInterpreters/CreateRule Tools/UMTInterpreters/GReAT Master Interpreter Tools/UMTInterpreters/GenerateCfgModel Tools/UMTInterpreters/GenerateConfig Tools/UMTInterpreters/GenerateGR Tools/UMTInterpreters/GenerateGRC Tools/UMTInterpreters/LibraryUpdate Tools/UMTInterpreters/PortConnectorProj Tools/Utils/UdmModelDiff include
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Mon May 2 12:22:45 CDT 2011
Author: ksmyth
Date: Mon May 2 12:22:44 2011
New Revision: 3711
Log:
Compat with SVN Udm. Remove "CUdmApp::ExtractName"s
Modified:
GReAT/trunk/Libraries/Configuration/GReATConfigUsage.cpp
GReAT/trunk/Libraries/Configuration/GReATConfigUsage.h
GReAT/trunk/Libraries/Engine/Effector.cpp
GReAT/trunk/Libraries/Engine/GReATTypes.h
GReAT/trunk/Libraries/Engine/GeneralBackend.h
GReAT/trunk/Libraries/GRAPI/GRAPIVS2010.vcxproj
GReAT/trunk/Libraries/GRCC/GRCC.CPP
GReAT/trunk/Libraries/GRCC/GRCGenOps.cpp
GReAT/trunk/Libraries/GRCC/GRCPrinter.cpp
GReAT/trunk/Libraries/RTT/RTTGenerator.cpp
GReAT/trunk/Tools/CodeGenerator/CG_console/main.cpp
GReAT/trunk/Tools/CodeGenerator/CG_interpreter/RawComponent.cpp
GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmApp.cpp
GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmApp.h
GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmConfig.h
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/CodeGenerator.cpp
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Effector.cpp
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.cpp
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.h
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/InputFilter.cpp
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/OutputAppender.cpp
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PacketPassing.cpp
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PacketPassing.h
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.cpp
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.h
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Sequencer.cpp
GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Translator.cpp
GReAT/trunk/Tools/CodeGenerator/ConfigGenerator/ConfigGenerator.cpp
GReAT/trunk/Tools/Debugger/GRD_interpreter/RawComponent.cpp
GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmApp.cpp
GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmApp.h
GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmConfig.h
GReAT/trunk/Tools/Engine/GRE_Interpreter/RawComponent.cpp
GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmApp.cpp
GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmApp.h
GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmConfig.h
GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/LegacyUpdateVisitor.cpp
GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/LegacyUpdateVisitor.h
GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/main.cpp
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML.cpp
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML.h
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmApp.cpp
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmApp.h
GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmConfig.h
GReAT/trunk/Tools/MetaGME2UMX/main.cpp
GReAT/trunk/Tools/UMTInterpreters/Blockify/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/Blockify/UdmApp.h
GReAT/trunk/Tools/UMTInterpreters/CreateRule/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/CreateRule/UdmApp.cpp
GReAT/trunk/Tools/UMTInterpreters/CreateRule/UdmApp.h
GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.cpp
GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.h
GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmConfig.h
GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/StdAfx.h
GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmApp.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmApp.h
GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmConfig.h
GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmApp.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmApp.h
GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmConfig.h
GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/umt2cfg.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateGR/Component.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateGR/UMLModelTransformer2GR.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateGR/UMLModelTransformer2GR.h
GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmApp.cpp
GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmApp.h
GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmConfig.h
GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/UdmApp.h
GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/UdmConfig.h
GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/GenMyTransform.cpp
GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/RawComponent.cpp
GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/UdmApp.cpp
GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/UdmApp.h
GReAT/trunk/Tools/Utils/UdmModelDiff/ModelDiff.cpp
GReAT/trunk/Tools/Utils/UdmModelDiff/ModelDiff.h
GReAT/trunk/Tools/Utils/UdmModelDiff/UdmModelDiff.cpp
GReAT/trunk/include/ErrorLog.h
GReAT/trunk/include/RTTGenerator.h
Modified: GReAT/trunk/Libraries/Configuration/GReATConfigUsage.cpp
==============================================================================
--- GReAT/trunk/Libraries/Configuration/GReATConfigUsage.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/Configuration/GReATConfigUsage.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -146,11 +146,11 @@
return isValid;
}
-void GReATConfigUsage::getStartRule( const set< GR::RewritingRule>& ruleset, vector< string>& startRulePath, GR::RewritingRule& startRule)
+void GReATConfigUsage::getStartRule( const std::set< GR::RewritingRule>& ruleset, std::vector< std::string>& startRulePath, GR::RewritingRule& startRule)
{
if ( startRulePath.empty())
return;
- const string& rname = *(startRulePath.begin());
+ const std::string& rname = *(startRulePath.begin());
GR::RewritingRule rule;
for( RewritingRuleSet::const_iterator i= ruleset.begin(); i!= ruleset.end(); ++i)
{
@@ -166,7 +166,7 @@
if( !startRulePath.empty())
{
// recursion
- set< GR::RewritingRule> children= rule.RewritingRule_kind_children();
+ std::set< GR::RewritingRule> children= rule.RewritingRule_kind_children();
getStartRule( children, startRulePath, startRule);
}
// end of traversal, start rule found.
Modified: GReAT/trunk/Libraries/Configuration/GReATConfigUsage.h
==============================================================================
--- GReAT/trunk/Libraries/Configuration/GReATConfigUsage.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/Configuration/GReATConfigUsage.h Mon May 2 12:22:44 2011 (r3711)
@@ -63,7 +63,7 @@
protected:
// Traverse 'ruleset' recursively as specified in 'startRulePath'.
// Return the last rule (specified in 'startRulePath') in 'startRule'.
- void getStartRule( const set< GR::RewritingRule>& ruleset, vector< string>& startRulePath, GR::RewritingRule& startRule);
+ void getStartRule( const std::set< GR::RewritingRule>& ruleset, std::vector< std::string>& startRulePath, GR::RewritingRule& startRule);
private:
// Reference to usage info section of GReATConfig model.
Modified: GReAT/trunk/Libraries/Engine/Effector.cpp
==============================================================================
--- GReAT/trunk/Libraries/Engine/Effector.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/Engine/Effector.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -29,6 +29,8 @@
#include "GReATUtils.h"
#include "RTTGenerator.h"
+using namespace std;
+
Effector::Effector(GR::RewritingRule *currRule,GeneralBackend *dataNetworkMap) :
boundRule(currRule),
backendMap(dataNetworkMap)
Modified: GReAT/trunk/Libraries/Engine/GReATTypes.h
==============================================================================
--- GReAT/trunk/Libraries/Engine/GReATTypes.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/Engine/GReATTypes.h Mon May 2 12:22:44 2011 (r3711)
@@ -11,6 +11,8 @@
#include "UmlExt.h"
#include "GeneralBackend.h"
+using namespace std;
+
typedef GeneralBackend* GeneralBackendPtr;
typedef Udm::Object Object;
Modified: GReAT/trunk/Libraries/Engine/GeneralBackend.h
==============================================================================
--- GReAT/trunk/Libraries/Engine/GeneralBackend.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/Engine/GeneralBackend.h Mon May 2 12:22:44 2011 (r3711)
@@ -7,6 +7,8 @@
#include "GR.h"
#include <map>
+using namespace std;
+
class GeneralBackend
{
typedef Udm::Object Object;
Modified: GReAT/trunk/Libraries/GRAPI/GRAPIVS2010.vcxproj
==============================================================================
--- GReAT/trunk/Libraries/GRAPI/GRAPIVS2010.vcxproj Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/GRAPI/GRAPIVS2010.vcxproj Mon May 2 12:22:44 2011 (r3711)
@@ -232,5 +232,6 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\META\externals\common-scripts\build_customization\udm.targets" />
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: GReAT/trunk/Libraries/GRCC/GRCC.CPP
==============================================================================
--- GReAT/trunk/Libraries/GRCC/GRCC.CPP Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/GRCC/GRCC.CPP Mon May 2 12:22:44 2011 (r3711)
@@ -152,7 +152,7 @@
#define GRC_MAKE "GRC_make2010.bat"
#endif
int sysret;
- cout << endl << "Creating and compiling GRC library." << endl;
+ std::cout << std::endl << "Creating and compiling GRC library." << std::endl;
if ( _ccfg._dynamic) {
std::string compileMode = _ccfg._debug ? "\"Win32 Debug\"" : "\"Win32 Release\"";
std::string cmdline = "cmd.exe /C call \"%GREAT_PATH%\\etc\\" GRC_MAKE "\" ";
Modified: GReAT/trunk/Libraries/GRCC/GRCGenOps.cpp
==============================================================================
--- GReAT/trunk/Libraries/GRCC/GRCGenOps.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/GRCC/GRCGenOps.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -4,6 +4,8 @@
#include "Uml.h"
using std::endl;
+using namespace std;
+
///////////////////////////////////////////////////////////////////////////////
class SpecCmpFuncPrinter {
public:
Modified: GReAT/trunk/Libraries/GRCC/GRCPrinter.cpp
==============================================================================
--- GReAT/trunk/Libraries/GRCC/GRCPrinter.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/GRCC/GRCPrinter.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -4,7 +4,7 @@
#include "GReATUtils.h"
using namespace GR;
-using std::string;
+using namespace std;
Modified: GReAT/trunk/Libraries/RTT/RTTGenerator.cpp
==============================================================================
--- GReAT/trunk/Libraries/RTT/RTTGenerator.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Libraries/RTT/RTTGenerator.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -4,6 +4,8 @@
#include <UdmGME.h>
#include <Uml.h>
+using namespace std;
+
RTTGenerator* RTTGenerator::_instance = 0;
std::string RTTGenerator::_rttRootName = "";
Modified: GReAT/trunk/Tools/CodeGenerator/CG_console/main.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CG_console/main.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CG_console/main.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -93,7 +93,7 @@
}
catch(udm_exception &e)
{
- cout << e.what() << endl;
+ std::cerr << e.what() << std::endl;
closeLogFile();
}
catch(CGEx &e)
Modified: GReAT/trunk/Tools/CodeGenerator/CG_interpreter/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CG_interpreter/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CG_interpreter/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -143,7 +143,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -43,7 +43,7 @@
#include "ConfigGenerator.h"
#include "GReATConfigMeta.h"
-
+using namespace std;
extern void dummy(void); // Dummy function for UDM meta initialization
/*********************************************************************************/
@@ -208,40 +208,3 @@
}
::SetCursor( ::LoadCursor( 0, IDC_ARROW));
}
-
-
-
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
Modified: GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -23,13 +23,8 @@
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
-
-
};
#endif // !defined(AFX_UDMAPP_H__296A93EB_6DB6_4179_AA0B_A3D799FB3A1C__INCLUDED_)
Modified: GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CG_interpreter/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -18,7 +18,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/CodeGenerator.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/CodeGenerator.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/CodeGenerator.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -3,6 +3,8 @@
#include "PEStringTable.h"
#include "GReATUtils.h"
+using namespace std;
+
void CodeGenerator::generate( const GR::RootFolder& grRoot)
{
set< GR::RewritingRule> topRules= grRoot.RewritingRule_kind_children();
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Effector.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Effector.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Effector.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -6,6 +6,8 @@
#include "GReATUtils.h"
#include "OutputSorter.h"
+using namespace std;
+
///////////////////////////////////////////////////////////////////////////////
void CodeForAssocRoleFunctor::operator()( const Uml::AssociationRole& role) const
{
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -6,6 +6,7 @@
#include "GReATUtils.h"
#include "OutputSorter.h"
+using namespace std;
GroupEffector::GroupEffector( const GRSimpleRule& rule,
const GeneralBackend& backend,
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.h
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/GroupEffector.h Mon May 2 12:22:44 2011 (r3711)
@@ -36,9 +36,9 @@
void preDeleteObjectLink(Class& ruleDef);
void executeGroupAction(Class& ruleDef);
void postDelete(Class& ruleDef);
- void moveGroup(Class& ruleDef, set<GR::GRBase>& groupMembers);
- void copyGroup(Class& ruleDef, set<GR::GRBase>& groupMembers);
- void deleteGroup(Class& ruleDef, set<GR::GRBase>& groupMembers);
+ void moveGroup(Class& ruleDef, std::set<GR::GRBase>& groupMembers);
+ void copyGroup(Class& ruleDef, std::set<GR::GRBase>& groupMembers);
+ void deleteGroup(Class& ruleDef, std::set<GR::GRBase>& groupMembers);
bool getAssociationClassEnd(const GR::ObjectWrapper& assocCls, GR::ObjectWrapper& srcCls, GR::ObjectWrapper& dstCls);
bool getAssociationLinks(const GR::ObjectWrapper& assocCls, GR::ObjectLink& srcLink, GR::ObjectLink& dstLink);
bool getAssociationRolenames(const GR::ObjectWrapper& assocCls, std::string& srcRolename, std::string& dstRolename);
@@ -49,27 +49,27 @@
std::string& fromVar=std::string(""), std::string& toVar=std::string(""));
void makeCallUdmcopyFun(Function* udmcopyFunc, Function* asscMapFunc, bool emptyLinks=true);
void makeUdmcopyAssocMapFunc(Function* assocMapFunc);
- void makeDeleteFunc(Function* delFunc, set<GR::ObjectWrapper>& delObjs, set<GR::ObjectLink>& delLinks);
+ void makeDeleteFunc(Function* delFunc, std::set<GR::ObjectWrapper>& delObjs, std::set<GR::ObjectLink>& delLinks);
void makeGetCopiedAssociationEndsCode(PE* currCode, const std::string& copy_map,
const GR::ObjectWrapper& grSrc, const GR::ObjectWrapper& grDst,
const std::string& fromSrc, const std::string& fromDst,
std::string& toSrc, std::string& toDst);
- bool isParentCopied(const GR::ObjectWrapper& grObj, const set<GR::GRBase>& groupmembers);
+ bool isParentCopied(const GR::ObjectWrapper& grObj, const std::set<GR::GRBase>& groupmembers);
// Create code for RTT
void createRTT();
protected:
Function* _groupEffecDef;
GR::PatternGroup _group;
- map<GR::ObjectWrapper,std::string > _boundObjList;
+ std::map<GR::ObjectWrapper,std::string > _boundObjList;
ParamDatas_t _ruleOutputs;
- set<GR::ObjectWrapper> _groupObjs;
- set<GR::ObjectWrapper> _groupSetObjs;
- set<GR::ObjectWrapper> _groupAssocObjs;
- set<GR::ObjectLink> _groupLinks;
- set<GR::ObjectLink> _newLinks;
- set<GR::ObjectWrapper> _deleteObjs;
- set<GR::ObjectLink> _preDeleteLinks;
- set<GR::ObjectLink> _postDeleteLinks;
+ std::set<GR::ObjectWrapper> _groupObjs;
+ std::set<GR::ObjectWrapper> _groupSetObjs;
+ std::set<GR::ObjectWrapper> _groupAssocObjs;
+ std::set<GR::ObjectLink> _groupLinks;
+ std::set<GR::ObjectLink> _newLinks;
+ std::set<GR::ObjectWrapper> _deleteObjs;
+ std::set<GR::ObjectLink> _preDeleteLinks;
+ std::set<GR::ObjectLink> _postDeleteLinks;
};
#endif //__GROUPEFFECTOR_H
\ No newline at end of file
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/InputFilter.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/InputFilter.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/InputFilter.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -3,6 +3,8 @@
#include "GReATUtils.h"
#include <algorithm>
+using namespace std;
+
void InputFilter::execute( ParamDatas_t& ruleInputs, Class& addTo, PEComposite& addCallTo)
{
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/OutputAppender.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/OutputAppender.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/OutputAppender.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -3,6 +3,7 @@
#include "GReATUtils.h"
#include <algorithm>
+using namespace std;
void OutputAppender::addOutputs( const ParamDatas_t& ruleOutputs, Function& filterFuncDef, FunctionCall& filterFuncCall)
{
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PacketPassing.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PacketPassing.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PacketPassing.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -5,6 +5,8 @@
#include <algorithm>
#include <iterator>
+using namespace std;
+
// This needed for insert_iterator
// In case of std::set-s, new elements are stored in a sorted sequence.
bool operator<( const ParamData& first, const ParamData& second)
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PacketPassing.h
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PacketPassing.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PacketPassing.h Mon May 2 12:22:44 2011 (r3711)
@@ -170,7 +170,7 @@
private:
// Maps rules to their parameters.
- typedef map< GR::RewritingRule, ParamList> RuleParamMap_t;
+ typedef std::map< GR::RewritingRule, ParamList> RuleParamMap_t;
RuleParamMap_t _ruleParams;
};
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -7,6 +7,9 @@
#include "Logging.h"
#include "UmlExt.h"
#include <UdmStatic.h>
+
+using namespace std;
+
///////////////////////////////////////////////////////////////////////////////
// global functions
@@ -166,7 +169,7 @@
bool& isCrossLink
)
{
- string fullpath = boundclass;
+ std::string fullpath = boundclass;
if(!ns_name.empty())
fullpath = ns_name + "::" + boundclass;
return getAssociationProperties(backend,paradigm,fullpath,association,isSourceAssoc,targetClass,assocClass,maxMultiplicity, isCrossLink);
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.h
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.h Mon May 2 12:22:44 2011 (r3711)
@@ -148,7 +148,7 @@
// This function creates an object wrapper under 'simpleLink.parent()', which refers to an association class
// with paradigm 'paradigmName', type 'classType'. Also creates a simple association connecting the association class and
// the object wrapper on the proper end of 'simpleLink'. This association class is then returned in 'assocClass'.
- void createPseudoAssocClass( const GR::ObjectLink& simpleLink, const std::string& paradigmName, const string& classType, GR::ObjectWrapper& assocClass) const;
+ void createPseudoAssocClass( const GR::ObjectLink& simpleLink, const std::string& paradigmName, const std::string& classType, GR::ObjectWrapper& assocClass) const;
// Used for the case when association class type links in the meta are specified as simple associations in the pattern.
// In these cases, code must be generated which incorporates the use of association classes.
// This function creates an object link under 'simpleLink.parent()', connecting the association class 'assocClass' and
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Sequencer.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Sequencer.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Sequencer.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -1,6 +1,8 @@
#include "Sequencer.h"
#include "Logging.h" // temporaly logger
+using namespace std;
+
Sequencer::Sequencer( Translator& translator) : _depth( 0) , _translator( translator)
{
}
Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Translator.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Translator.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/Translator.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -12,6 +12,9 @@
#include "OutputSorter.h"
#include "DistinguishedOutputSorter.h"
#include <iterator>
+
+using namespace std;
+
void Translator::translateBlock( const GRBlock& block)
{
Class* blockDef= NULL;
Modified: GReAT/trunk/Tools/CodeGenerator/ConfigGenerator/ConfigGenerator.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/ConfigGenerator/ConfigGenerator.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/CodeGenerator/ConfigGenerator/ConfigGenerator.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -18,6 +18,8 @@
#include <iterator>
+using namespace std;
+
///////////////////////////////////////////////////////////////////////////////
std::string createTempRootNames( const GReATConfig::TemporaryFileUsage& tfu) {
return ( std::string)tfu.MetaName() + RES+ ( std::string)tfu.RootClassName();
Modified: GReAT/trunk/Tools/Debugger/GRD_interpreter/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/Debugger/GRD_interpreter/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Debugger/GRD_interpreter/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -146,7 +146,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -54,13 +54,7 @@
typedef long uniqueId_type;
-wstring UdmId2GmeId(uniqueId_type udmId) {
- wchar_t buffer[24];
- swprintf_s(buffer, L"id-%04X-%08X", udmId / 100000000 + 100, udmId % 100000000);
- return wstring(buffer);
-}
-
-
+using UdmGme::UdmId2GmeId;
char* GetRelativeFilename(const char *currentDirectory,const char *absoluteFilename);
@@ -84,17 +78,17 @@
DECLARE_MESSAGE_MAP()
};*/
-string convertPath(const string ¤tPath, const string &absoluteFilename)
+std::string convertPath(const std::string ¤tPath, const std::string &absoluteFilename)
{
- string path(absoluteFilename);
+ std::string path(absoluteFilename);
if(!absoluteFilename.empty() &&
isSameDrive(currentPath.c_str(), absoluteFilename.c_str()))
- path = (string)(GetRelativeFilename(currentPath.c_str(),absoluteFilename.c_str()));
+ path = (std::string)(GetRelativeFilename(currentPath.c_str(),absoluteFilename.c_str()));
return path;
}
-static string currPath = "";
+static std::string currPath = "";
/*********************************************************************************/
/* Initialization function. The framework calls it before preparing the backend. */
/* Initialize here the settings in the config static object. */
@@ -143,12 +137,13 @@
void CUdmApp::UdmMain(
Udm::DataNetwork* p_backend, // Backend pointer(already open!)
Udm::Object focusObject, // Focus object
- set<Udm::Object> selectedObjects, // Selected objects
+ std::set<Udm::Object> selectedObjects, // Selected objects
long param, // Parameters
CComPtr<IGMEOLEApp> gme,
IMgaProject *project
)
{
+ using namespace std;
UMLModelTransformer::RootFolder rf = UMLModelTransformer::RootFolder::Cast(p_backend->GetRootObject());
const set<UMLModelTransformer::Configurations> &cfgs = rf.Configurations_kind_children();
if(cfgs.empty()) throw udm_exception("No Configurations found.");
@@ -197,13 +192,6 @@
std::string makeCall = "\"" + grdPath + "\"";
makeCall += " \"" + greate_cfg + "|" + ss.str() + "\"" ; ///Updated by Akash
- CString mcall(makeCall.c_str());
-
-
- char *tmpstr = new char[mcall.GetLength() + 1];
- strcpy(tmpstr, mcall);
-
-
STARTUPINFO si;
PROCESS_INFORMATION pi;
@@ -211,10 +199,9 @@
si.cb = sizeof(si);
ZeroMemory( &pi, sizeof(pi) );
-
// Start the child process.
if( !CreateProcess( NULL, // No module name (use command line).
- tmpstr , // Command line.
+ const_cast<LPSTR>(makeCall.c_str()) , // Command line.
NULL, // Process handle not inheritable.
NULL, // Thread handle not inheritable.
FALSE, // Set handle inheritance to FALSE.
@@ -225,7 +212,20 @@
&pi ) // Pointer to PROCESS_INFORMATION structure.
)
{
- throw udm_exception(" grd createProcess failed." );
+ std::string error = "grd createProcess failed";
+
+ LPTSTR errorText = NULL;
+ FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR)&errorText, 0, NULL);
+
+ if (NULL != errorText) {
+ error += ": ";
+ error += errorText;
+ LocalFree(errorText);
+ }
+
+ throw udm_exception(error);
}
// Wait until child process exits.
@@ -233,7 +233,6 @@
//WaitForSingleObject( pi.hProcess, INFINITE );
CloseHandle( pi.hProcess );
CloseHandle( pi.hThread );
- delete []tmpstr;
// Close process and thread handles.
p_backend->CloseWithUpdate();
Modified: GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -29,12 +29,12 @@
{
public:
ConfigInfo() {};
- ConfigInfo(string id, string meta, string mode):fileId(id),metaName(meta),fileMode(mode){};
- string fileId;
- string metaName;
- string fileMode;
- string filePath;
- string copyPath;
+ ConfigInfo(std::string id, std::string meta, std::string mode):fileId(id),metaName(meta),fileMode(mode){};
+ std::string fileId;
+ std::string metaName;
+ std::string fileMode;
+ std::string filePath;
+ std::string copyPath;
};
class CUdmApp
@@ -42,14 +42,14 @@
public:
static int Initialize();
static CString mgaPath;
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param,CComPtr< IGMEOLEApp > gme,IMgaProject *project);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param,CComPtr< IGMEOLEApp > gme,IMgaProject *project);
CComPtr<IGMEOLEApp> _gme;
CComPtr<IMgaProject> _project;
protected:
- static void getInitialCfgInfos(const string &greate_cfg,
+ static void getInitialCfgInfos(const std::string &greate_cfg,
UMLModelTransformer::Configuration &cfgfile,
- vector<ConfigInfo> &cfgInfos);
+ std::vector<ConfigInfo> &cfgInfos);
};
#endif // !defined(AFX_UDMAPP_H__296A93EB_6DB6_4179_AA0B_A3D799FB3A1C__INCLUDED_)
Modified: GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Debugger/GRD_interpreter/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -54,7 +54,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/Engine/GRE_Interpreter/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/Engine/GRE_Interpreter/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Engine/GRE_Interpreter/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -151,7 +151,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -327,37 +327,3 @@
}
return true;
}
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
\ No newline at end of file
Modified: GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -50,12 +50,9 @@
{
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
static CString mgaPath;
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
protected:
static void getInitialCfgInfos(const string &greate_cfg,
UMLModelTransformer::Configuration &cfgfile,
Modified: GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Engine/GRE_Interpreter/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -55,7 +55,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/LegacyUpdateVisitor.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/LegacyUpdateVisitor.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/LegacyUpdateVisitor.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -4,6 +4,8 @@
#include "LegacyUpdateVisitor.h"
+using namespace std;
+
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
Modified: GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/LegacyUpdateVisitor.h
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/LegacyUpdateVisitor.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/LegacyUpdateVisitor.h Mon May 2 12:22:44 2011 (r3711)
@@ -14,7 +14,7 @@
struct stringicmp;
-typedef map<string, string, stringicmp> strmap;
+typedef std::map<std::string, std::string, stringicmp> strmap;
using namespace MetaGME;
@@ -34,21 +34,21 @@
void Visit_Set(const Set&);
protected:
- void ConverGeneralPreferenceToMap(string pref, strmap &prefmap);
- string GetValueForName(string name, strmap &prefmap);
+ void ConverGeneralPreferenceToMap(std::string pref, strmap &prefmap);
+ std::string GetValueForName(std::string name, strmap &prefmap);
};
struct stringicmp
{
- bool operator()(const string& first, const string& second) const;
+ bool operator()(const std::string& first, const std::string& second) const;
};
// From website http://www.thecodezone.com/diary/archives/000057.html
-class StringTokenizer : public vector<string>
+class StringTokenizer : public std::vector<std::string>
{
public:
- StringTokenizer(const string &rStr, const string &rDelimiters = " ,\n");
+ StringTokenizer(const std::string &rStr, const std::string &rDelimiters = " ,\n");
};
Modified: GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/main.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/main.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/LegacyUpdate/main.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -13,7 +13,7 @@
#include "MetaGME.h"
#include "LegacyUpdateVisitor.h"
-//using namespace std;
+using namespace std;
bool AskUserForConstraint()
{
@@ -56,11 +56,11 @@
catch(udm_exception &exc)
{
- cout<<"Exception occured: "<<exc.what()<<endl;
+ cerr<<"Exception occured: "<<exc.what()<<endl;
}
catch(_com_error ce)
{
- cout << (string)ce.Description() << endl;
+ cerr << (string)ce.Description() << endl;
}
// _getch();
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -26,6 +26,8 @@
#include "cctype"
#include "UmlExt.h"
+using namespace std;
+
bool AskUserForConstraint(long);
void MetaGME2UML::transformMetaGME2UmlGME()
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML.h
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML.h Mon May 2 12:22:44 2011 (r3711)
@@ -57,10 +57,10 @@
{ size_t operator()(const Udm::Object __s) const { return __s.uniqueId(); }
};*/
-typedef map<string, string, stringicmp> strmap;
+typedef std::map<std::string, std::string, stringicmp> strmap;
//typedef hash_map<MetaGME::ContainedInPar, UmlGME::ClassBase, udmhash, equal_to<MetaGME::ContainedInPar> > map_CIP2CB;
-typedef map<MetaGME::ContainedInPar, UmlGME::ClassBase> map_CIP2CB;
-typedef map<MetaGME::ContainedInPar, MetaGME::ContainedInPar> map_CIP2CIP;
+typedef std::map<MetaGME::ContainedInPar, UmlGME::ClassBase> map_CIP2CB;
+typedef std::map<MetaGME::ContainedInPar, MetaGME::ContainedInPar> map_CIP2CIP;
//typedef hash_map<MetaGME::ContainedInPar, MetaGME::ContainedInPar, udmhash, equal_to<MetaGME::ContainedInPar> > map_CIP2CIP;
class MetaGME2UML
@@ -82,9 +82,9 @@
map_CIP2CB mapMetaGME2UmlGME_Class;
- map< MetaGME::ParadigmSheet, UmlGME::ClassDiagram> mapMetaGME2UmlGME_Paradigm;
+ std::map< MetaGME::ParadigmSheet, UmlGME::ClassDiagram> mapMetaGME2UmlGME_Paradigm;
- map< UmlGME::ClassBase, pair< UmlGME::Class, UmlGME::Class> > mapUmlClass2ImplInheritBases;
+ std::map< UmlGME::ClassBase, std::pair< UmlGME::Class, UmlGME::Class> > mapUmlClass2ImplInheritBases;
map_CIP2CB implMap, intfMap, reguMap;
map_CIP2CIP equivMap;
@@ -104,9 +104,9 @@
void MakeIntImplDiagram();
- map<string, string> attmap, conmap, constrmap;
+ std::map<std::string, std::string> attmap, conmap, constrmap;
- map<UmlGME::Class, bool> maphasbaseimpl, maphasbaseintf;
+ std::map<UmlGME::Class, bool> maphasbaseimpl, maphasbaseintf;
void Phase1_SetUpSheets();
//void SetUpSheets(MetaGME::RootFolder grf, Udm::Object urf); //need to know where to create CD and NS objects 4.06.07
@@ -174,19 +174,19 @@
MetaGME::ContainedInPar GetRefMetaGMEObject(MetaGME::ContainedInPar base);
void InitializeSheets(MetaGME::RootFolder grf, Udm::Object urf);
- string ConvertPosition(string pos);
- string MakePosition(int ux, int uy, int cx, int cy);
- string MakePosition(int ux, int uy);
- void ConverGeneralPreferenceToMap(string pref, strmap &prefmap);
- string GetValueForName(string name, strmap &prefmap);
+ std::string ConvertPosition(std::string pos);
+ std::string MakePosition(int ux, int uy, int cx, int cy);
+ std::string MakePosition(int ux, int uy);
+ void ConverGeneralPreferenceToMap(std::string pref, strmap &prefmap);
+ std::string GetValueForName(std::string name, strmap &prefmap);
void AddAttribute(MetaGME::ContainedInPar fco, UmlGME::Class cl);
- string _ConvertPositionAttribute(string pos, char* mapingstr);
+ std::string _ConvertPositionAttribute(std::string pos, char* mapingstr);
- void GetPosAttr(string spos, map<string, string> &atmap);
- string MakePosAttr(string spos, map<string, string> posmap);
+ void GetPosAttr(std::string spos, std::map<std::string, std::string> &atmap);
+ std::string MakePosAttr(std::string spos, std::map<std::string, std::string> posmap);
- bool GetPosAttr(string spos, string aspect, int &x, int &y);
+ bool GetPosAttr(std::string spos, std::string aspect, int &x, int &y);
// Asking about constrints
bool constraintHit;
@@ -196,17 +196,17 @@
struct stringicmp
{
- bool operator()(const string& first, const string& second) const;
+ bool operator()(const std::string& first, const std::string& second) const;
};
// From website http://www.thecodezone.com/diary/archives/000057.html
-class StringTokenizer : public vector<string>
+class StringTokenizer : public std::vector<std::string>
{
public:
- StringTokenizer(const string &rStr, const string &rDelimiters = " ,\n");
+ StringTokenizer(const std::string &rStr, const std::string &rDelimiters = " ,\n");
};
MetaGME::BaseFCO RefByProxy( const MetaGME::BaseFCO& fco);
-#endif
\ No newline at end of file
+#endif
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UML_2.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -28,6 +28,8 @@
#include <iterator>
+using namespace std;
+
bool AskUserForConstraint(long);
void MetaGME2UML::Phase5_CreateConnections()
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -148,7 +148,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -39,6 +39,8 @@
#include "UmlGME.h"
#include "MetaGME2UML.h"
+using namespace std;
+
extern void dummy(void); // Dummy function for UDM meta initialization
/*********************************************************************************/
@@ -93,6 +95,8 @@
/***********************************************/
/* Main entry point for Udm-based Interpreter */
/***********************************************/
+using namespace std;
+
string CUdmApp::mgaDir;
void CUdmApp::UdmMain(
@@ -220,38 +224,3 @@
}
-
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -26,15 +26,10 @@
{
public:
- static string mgaDir;
+ static std::string mgaDir;
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
-
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
-
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
};
Modified: GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/MetaGME2UMX Interpreters/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -51,7 +51,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/MetaGME2UMX/main.cpp
==============================================================================
--- GReAT/trunk/Tools/MetaGME2UMX/main.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/MetaGME2UMX/main.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -16,7 +16,7 @@
//#include "..\..\etc\GReATVersion.h"
char constraint;
-//using namespace std;
+using namespace std;
bool AskUserForConstraint(long param)
{
@@ -79,12 +79,12 @@
catch(udm_exception &exc)
{
- cout<<"Exception occured: "<<exc.what()<<endl;
+ cerr<<"Exception occured: "<<exc.what()<<endl;
return 1;
}
catch(_com_error ce)
{
- cout << (string)ce.Description() << endl;
+ cerr << (string)ce.Description() << endl;
return 2;
}
Modified: GReAT/trunk/Tools/UMTInterpreters/Blockify/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/Blockify/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/Blockify/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -137,7 +137,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/UMTInterpreters/Blockify/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/Blockify/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/Blockify/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -27,7 +27,7 @@
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
};
#endif // !defined(AFX_UDMAPP_H__296A93EB_6DB6_4179_AA0B_A3D799FB3A1C__INCLUDED_)
Modified: GReAT/trunk/Tools/UMTInterpreters/CreateRule/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/CreateRule/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/CreateRule/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -137,7 +137,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/UMTInterpreters/CreateRule/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/CreateRule/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/CreateRule/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -13,6 +13,8 @@
#include <map>
#include <string>
+using namespace std;
+
typedef map<UMLModelTransformer::PatternClass, UMLModelTransformer::Out> POMap;
int CUdmApp::Initialize()
@@ -150,37 +152,3 @@
port.position() = newPos;
}
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
Modified: GReAT/trunk/Tools/UMTInterpreters/CreateRule/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/CreateRule/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/CreateRule/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -27,11 +27,8 @@
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
};
Modified: GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -175,7 +175,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
@@ -394,7 +394,7 @@
}
closeErrorLog(tmp_str);
- string configDir;
+ std::string configDir;
int ne = CUdmApp::configName.find_last_of('\\');
configDir = CUdmApp::configName.substr(0,ne+1);
Modified: GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -42,6 +42,8 @@
#include "FileInfoDialog.h"
+using namespace std;
+
#define GREAT_SILENT_MODE 128
extern void dummy(void); // Dummy function for UDM meta initialization
@@ -258,37 +260,3 @@
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
Modified: GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -32,19 +32,15 @@
static BOOL genGR;
static BOOL genUDM;
- static string mgaDir;
- static string configName;
- static string grName;
- static string udmName;
+ static std::string mgaDir;
+ static std::string configName;
+ static std::string grName;
+ static std::string udmName;
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
-
};
#endif // !defined(AFX_UDMAPP_H__296A93EB_6DB6_4179_AA0B_A3D799FB3A1C__INCLUDED_)
Modified: GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GReAT Master Interpreter/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -49,7 +49,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -146,7 +146,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/StdAfx.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/StdAfx.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/StdAfx.h Mon May 2 12:22:44 2011 (r3711)
@@ -36,4 +36,6 @@
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+using namespace std;
+
#endif // !defined(AFX_STDAFX_H__C4EFDDFC_C095_4509_B571_632F0986D162__INCLUDED)
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -597,37 +597,3 @@
return true;
}
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
\ No newline at end of file
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -49,12 +49,8 @@
{
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
-protected:
};
#endif // !defined(AFX_UDMAPP_H__296A93EB_6DB6_4179_AA0B_A3D799FB3A1C__INCLUDED_)
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateCfgModel/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -55,7 +55,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -144,7 +144,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -48,6 +48,8 @@
#include "GReATUtils.h"
#include "ErrorLog.h"
+using namespace std;
+
#define GREAT_SILENT_MODE 128
extern void dummy(void); // Dummy function for UDM meta initialization
@@ -416,38 +418,3 @@
}
-
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -28,12 +28,7 @@
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
-
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
-
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
};
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -49,7 +49,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/umt2cfg.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/umt2cfg.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateConfig/umt2cfg.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -7,6 +7,8 @@
//#include "GReATSort.h"
//#include "UMT2Config-gr_cmptempl.h"
+using namespace std;
+
void UMT2Config_0::operator()( const Packets_t& umtConfigmodels_1, const Packets_t& confRFs_3)
{
#ifdef PRINT_INFO
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateGR/Component.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateGR/Component.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateGR/Component.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -12,6 +12,7 @@
char* GetRelativeFilename(const char *currentDirectory,const char *absoluteFilename);
using namespace GR;
+using namespace std;
void CComponent::InvokeEx(CBuilder &builder,CBuilderObject *focus, CBuilderObjectList &selected, long param)
{
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateGR/UMLModelTransformer2GR.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateGR/UMLModelTransformer2GR.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateGR/UMLModelTransformer2GR.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -3,6 +3,8 @@
#include "ErrorLog.h"
#include "umt_exception.h"
+using namespace std;
+
IMPLEMENT_CUSTOMMODELBASE(UMT_ExpressionModel, CBuilderModel)
IMPLEMENT_CUSTOMMODELBASE(UMT_CompoundRuleModel, UMT_ExpressionModel)
IMPLEMENT_CUSTOMMODELBASE(UMT_PrimitiveRuleModel, UMT_ExpressionModel)
@@ -21,6 +23,7 @@
IMPLEMENT_CUSTOMCONNECTION(UMT_PatternAssociation, CBuilderConnection, "PatternAssociation")
using namespace GR;
+using namespace std;
// Implementation of common functions in the base class "Expression"
bool UMT_ExpressionModel::Phase1_CreateObjects()
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateGR/UMLModelTransformer2GR.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateGR/UMLModelTransformer2GR.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateGR/UMLModelTransformer2GR.h Mon May 2 12:22:44 2011 (r3711)
@@ -140,7 +140,7 @@
virtual Udm::Object GetUdmParent() { return UdmParent; }
virtual bool SetUdmParent(Udm::Object Parent) {UdmParent = Parent; return true;}
- map<CBuilderReferencePort *, GR::ObjectWrapperProxy> childportmap;
+ std::map<CBuilderReferencePort *, GR::ObjectWrapperProxy> childportmap;
public:
virtual bool SetSpecialPeerAttr();
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -142,7 +142,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -42,6 +42,8 @@
// GReAT includes
#include "GReATUtils.h"
+using namespace std;
+
extern void dummy(void); // Dummy function for UDM meta initialization
/*********************************************************************************/
@@ -391,38 +393,3 @@
}
-
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -27,13 +27,8 @@
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
-
-
};
#endif // !defined(AFX_UDMAPP_H__296A93EB_6DB6_4179_AA0B_A3D799FB3A1C__INCLUDED_)
Modified: GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/GenerateGRC/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -49,7 +49,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -137,7 +137,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -25,7 +25,7 @@
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
};
Modified: GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/UdmConfig.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/UdmConfig.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/LibraryUpdate/UdmConfig.h Mon May 2 12:22:44 2011 (r3711)
@@ -49,7 +49,7 @@
struct _config
{
// Global settings
- string metaPath;
+ std::string metaPath;
};
extern _config config;
Modified: GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/GenMyTransform.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/GenMyTransform.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/GenMyTransform.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -7,6 +7,8 @@
#include "GReATSort.h"
#include "MyTransform-gr_cmptempl.h"
+using namespace std;
+
void TopBlock_0::operator()( const Packets_t& ins_1)
{
#ifdef PRINT_INFO
Modified: GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/RawComponent.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/RawComponent.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/RawComponent.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -137,7 +137,7 @@
currentObject=dngBackend.Gme2Udm(ccpFocus);
}
- set<Udm::Object> selectedObjects;
+ std::set<Udm::Object> selectedObjects;
CComPtr<IMgaFCOs> ccpSelObject(selectedobjs);
Modified: GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/UdmApp.cpp
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/UdmApp.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/UdmApp.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -11,6 +11,8 @@
#include "MyTransform-gr_cmptempl.h"
#include "PortSorters.h"
+using namespace std;
+
typedef std::list< Udm::Object> Packets_t;
/*********************************************************************************/
@@ -95,7 +97,7 @@
void CUdmApp::UdmMain(
Udm::DataNetwork* p_backend, // Backend pointer(already open!)
Udm::Object focusObject, // Focus object
- set<Udm::Object> selectedObjects, // Selected objects
+ std::set<Udm::Object> selectedObjects, // Selected objects
long param) // Parameters
{
size_t sizeOfIncoming = selectedObjects.size();
@@ -421,38 +423,3 @@
}
-
-#ifdef _DEBUG
-/*****************************************************/
-/* Debug time helper function. If the object has an */
-/* attribute called "name", this function retreives */
-/* it to help you to find it in the model during the */
-/* application development. Usualy every GME Object */
-/* has a "name" attribute. If an object hapens not */
-/* to have it,function retreives <no name specified>.*/
-/*****************************************************/
-string CUdmApp::ExtractName(Udm::Object ob)
-{
- Uml::Class cls= ob.type();
- set<Uml::Attribute> attrs=cls.attributes();
-
- // Adding parent attributes
- set<Uml::Attribute> aattrs=Uml::AncestorAttributes(cls);
- attrs.insert(aattrs.begin(),aattrs.end());
-
- for(set<Uml::Attribute>::iterator ai = attrs.begin();ai != attrs.end(); ai++)
- {
- if(string(ai->type())=="String")
- {
- string str=ai->name();
- if(str=="name")
- {
- string value=ob.getStringAttr(*ai);
- if(value.empty())value="<empty string>";
- return value;
- }
- }
- }
- return string("<no name specified>");
-}
-#endif
Modified: GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/UdmApp.h
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/UdmApp.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/UMTInterpreters/PortConnectorProj/UdmApp.h Mon May 2 12:22:44 2011 (r3711)
@@ -27,11 +27,8 @@
public:
static int Initialize();
- static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, set<Udm::Object> selectedObjects, long param);
+ static void UdmMain(Udm::DataNetwork* p_backend,Udm::Object currentObject, std::set<Udm::Object> selectedObjects, long param);
-#ifdef _DEBUG
- static string ExtractName(Udm::Object ob);
-#endif
};
Modified: GReAT/trunk/Tools/Utils/UdmModelDiff/ModelDiff.cpp
==============================================================================
--- GReAT/trunk/Tools/Utils/UdmModelDiff/ModelDiff.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Utils/UdmModelDiff/ModelDiff.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -2,6 +2,8 @@
#include "UdmUtil.h"
+using namespace std;
+
set<Uml::Class> assoClss;
set<Udm::Object> src_assoObjs, dst_assoObjs;
Modified: GReAT/trunk/Tools/Utils/UdmModelDiff/ModelDiff.h
==============================================================================
--- GReAT/trunk/Tools/Utils/UdmModelDiff/ModelDiff.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Utils/UdmModelDiff/ModelDiff.h Mon May 2 12:22:44 2011 (r3711)
@@ -18,7 +18,7 @@
#include "UmlExt.h"
bool CompareObjects(Udm::Object srcObj, Udm::Object dstObj, Uml::Diagram dgr);
-void AddNameSurrogate(string classname, string namesurrogate);
-void AddUnnamedRef(string refname);
+void AddNameSurrogate(std::string classname, std::string namesurrogate);
+void AddUnnamedRef(std::string refname);
#endif //UDMMODELDIFF_H
\ No newline at end of file
Modified: GReAT/trunk/Tools/Utils/UdmModelDiff/UdmModelDiff.cpp
==============================================================================
--- GReAT/trunk/Tools/Utils/UdmModelDiff/UdmModelDiff.cpp Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/Tools/Utils/UdmModelDiff/UdmModelDiff.cpp Mon May 2 12:22:44 2011 (r3711)
@@ -11,6 +11,8 @@
#include "ModelDiff.h"
#include "Uml.h"
+using namespace std;
+
void dummy(void) {; } // Dummy function for initialization
@@ -73,7 +75,7 @@
}
catch(udm_exception &exc)
{
- cout<<"Exception occured: "<<exc.what()<<endl;
+ cerr<<"Exception occured: "<<exc.what()<<endl;
return -1;
}
Modified: GReAT/trunk/include/ErrorLog.h
==============================================================================
--- GReAT/trunk/include/ErrorLog.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/include/ErrorLog.h Mon May 2 12:22:44 2011 (r3711)
@@ -18,7 +18,7 @@
{
public:
// static bool calledbyMaster;
- static string filePath;
+ static std::string filePath;
static int msgNum;
static ErrorLog* Instance();
static ErrorLog* Instance(const std::string& file_path);
@@ -65,7 +65,7 @@
std::ofstream logFile;
};
-string ErrorLog::filePath = "";
+std::string ErrorLog::filePath = "";
int ErrorLog::msgNum = 0;
ErrorLog* ErrorLog::instance = 0;
Modified: GReAT/trunk/include/RTTGenerator.h
==============================================================================
--- GReAT/trunk/include/RTTGenerator.h Mon May 2 12:02:00 2011 (r3710)
+++ GReAT/trunk/include/RTTGenerator.h Mon May 2 12:22:44 2011 (r3711)
@@ -21,11 +21,11 @@
#else
#define GREAT_RTT_DEBUG_D ""
#endif
-#if (_MSC_VER == 1600) /* VS2010 */
-#pragma comment(lib, "RTTGeneratorVC10" GREAT_RTT_DEBUG_D ".lib")
-#else
-#pragma comment(lib, "RTTGenerator" GREAT_RTT_DEBUG_D ".lib")
-#endif /* _MSC_VER == 1600 */
+#if (_MSC_VER == 1600) /* VS2010 */
+#pragma comment(lib, "RTTGeneratorVC10" GREAT_RTT_DEBUG_D ".lib")
+#else
+#pragma comment(lib, "RTTGenerator" GREAT_RTT_DEBUG_D ".lib")
+#endif /* _MSC_VER == 1600 */
class RTTGenerator
@@ -39,8 +39,8 @@
void generateRTT(int srcId, int srcDNId, const std::string& srcName,
int dstId, int dstDNId, const std::string& dstName);
void close();
- static void convertUdmCopyMap(const UdmUtil::copy_assoc_map& copyMap, map<int, int>& copyIdMap, bool reverse);
- void addUdmCopyMap(int workDNId, map<int, int>& udmCopyMap);
+ static void convertUdmCopyMap(const UdmUtil::copy_assoc_map& copyMap, std::map<int, int>& copyIdMap, bool reverse);
+ void addUdmCopyMap(int workDNId, std::map<int, int>& udmCopyMap);
protected:
RTTGenerator();
@@ -54,8 +54,8 @@
Udm::SmartDataNetwork* _rttdn;
RTT::RTTRoot _rttRoot;
RTT::ExecuteRule _currRule;
- map< pair<int, int>, RTT::UdmObject> _currObjMap;
- map<int, map<int, int> > _dnUdmCopyMap;
+ std::map< std::pair<int, int>, RTT::UdmObject> _currObjMap;
+ std::map<int, std::map<int, int> > _dnUdmCopyMap;
};
#endif
\ No newline at end of file
More information about the Mobies-commit
mailing list