summaryrefslogtreecommitdiff
path: root/base/inifile.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2004-08-05 02:03:47 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2004-08-05 02:03:47 -0700
commitd7dfe51faed84ba2b06c32a302597c0226ea239c (patch)
tree52898afd02df6502cc35b75510eb48930df277fb /base/inifile.hh
parent1939370c96b48a1f635799b6017d5f5f11799353 (diff)
downloadgem5-d7dfe51faed84ba2b06c32a302597c0226ea239c.tar.xz
Integrate Python configuration script parsing into m5 itself.
SConscript: Add pyconfig/{pyconfig,code}.cc Add list of object description (.od) files. Include pyconfig/SConscript. base/inifile.cc: Get rid of CPP_PIPE... it never really worked anyway. base/inifile.hh: Make load(ifstream&) method public so pyconfig code can call it. sim/main.cc: Handle Python config scripts (end in '.py' instead of '.ini'). sim/pyconfig/m5configbase.py: Add license. Fix minor __setattr__ problem (2.3 related?) --HG-- rename : util/config/m5configbase.py => sim/pyconfig/m5configbase.py extra : convert_revision : 5e004922f950bfdefced333285584b80ad7ffb83
Diffstat (limited to 'base/inifile.hh')
-rw-r--r--base/inifile.hh12
1 files changed, 6 insertions, 6 deletions
diff --git a/base/inifile.hh b/base/inifile.hh
index 01e4e6c17..58a657db4 100644
--- a/base/inifile.hh
+++ b/base/inifile.hh
@@ -151,12 +151,6 @@ class IniFile
/// @retval Pointer to section object, or NULL if not found.
Section *findSection(const std::string &sectionName) const;
- /// Load parameter settings from given istream. This is a helper
- /// function for load(string) and loadCPP(), which open a file
- /// and then pass it here.
- /// @retval True if successful, false if errors were encountered.
- bool load(std::istream &f);
-
public:
/// Constructor.
IniFile();
@@ -164,6 +158,12 @@ class IniFile
/// Destructor.
~IniFile();
+ /// Load parameter settings from given istream. This is a helper
+ /// function for load(string) and loadCPP(), which open a file
+ /// and then pass it here.
+ /// @retval True if successful, false if errors were encountered.
+ bool load(std::istream &f);
+
/// Load the specified file, passing it through the C preprocessor.
/// Parameter settings found in the file will be merged with any
/// already defined in this object.