diff --git a/vlsisapd/openChams/Circuit.h b/vlsisapd/openChams/Circuit.h index 64b103bb..4ed18ba5 100644 --- a/vlsisapd/openChams/Circuit.h +++ b/vlsisapd/openChams/Circuit.h @@ -10,6 +10,8 @@ #ifndef __OPENCHAMS_CIRCUIT_H__ #define __OPENCHAMS_CIRCUIT_H__ +#include + #include #include @@ -33,19 +35,19 @@ class Circuit { inline Netlist* getNetlist(); inline Schematic* getSchematic(); inline void addParameter(Name, double); - inline void addParameter(Name, string); + inline void addParameter(Name, std::string); inline Parameters getParameters(); inline void setNetlist(Netlist*); inline void setSchematic(Schematic*); inline void setSizing(Sizing*); - bool writeToFile(string filePath); - static Circuit* readFromFile(const string filePath); + bool writeToFile(std::string filePath); + static Circuit* readFromFile(const std::string filePath); private: Name readParameter(xmlNode*, double&); - Name readParameterEq(xmlNode*, string&); + Name readParameterEq(xmlNode*, std::string&); Name readConnector(xmlNode*); void readCircuitParameters(xmlNode*); void readNetList(xmlNode*); @@ -64,8 +66,8 @@ class Circuit { void readEquations(xmlNode*, Sizing*); void readEquation(xmlNode*, Sizing*); - void check_uppercase(string& str, vector& compares, string message); - void check_lowercase(string& str, vector& compares, string message); + void check_uppercase(std::string& str, std::vector& compares, std::string message); + void check_lowercase(std::string& str, std::vector& compares, std::string message); Name _name; Name _techno; @@ -81,7 +83,7 @@ inline double Circuit::getValue(Name name) { return _params.getValue(name); inline Netlist* Circuit::getNetlist() { return _netlist; }; inline Schematic* Circuit::getSchematic() { return _schematic; }; inline void Circuit::addParameter(Name name, double value) { _params.addParameter(name, value); }; -inline void Circuit::addParameter(Name name, string eqStr) { _params.addParameter(name, eqStr); }; +inline void Circuit::addParameter(Name name, std::string eqStr) { _params.addParameter(name, eqStr); }; inline Parameters Circuit::getParameters() { return _params; }; inline void Circuit::setNetlist(Netlist* netlist) { _netlist = netlist; }; inline void Circuit::setSchematic(Schematic* schem) { _schematic = schem; }; diff --git a/vlsisapd/openChams/Parameters.h b/vlsisapd/openChams/Parameters.h index a38e02e3..3a8356df 100644 --- a/vlsisapd/openChams/Parameters.h +++ b/vlsisapd/openChams/Parameters.h @@ -36,7 +36,7 @@ private: inline bool Parameters::isEmpty() { return ((_params.size() == 0)&&(_paramsEq.size() == 0))? true : false; } inline const std::map& Parameters::getValues() { return _params; }; -inline const std::map& Parameters::getEqValues() { return _paramsEq; }; +inline const std::map& Parameters::getEqValues() { return _paramsEq; }; } // namespace #endif diff --git a/vlsisapd/openChams/Sizing.cpp b/vlsisapd/openChams/Sizing.cpp index 31070d9e..82bede3c 100644 --- a/vlsisapd/openChams/Sizing.cpp +++ b/vlsisapd/openChams/Sizing.cpp @@ -42,4 +42,5 @@ void Sizing::addEquation(Name equationName, string equation) { _equations[equationName] = equation; } -} // namespace \ No newline at end of file +} // namespace +