diff options
| author | Gregory Montoir | 2008-09-29 19:09:56 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2008-09-29 19:09:56 +0000 |
| commit | cb4caae8eb20f81a6df89d1f1a11b583049409f4 (patch) | |
| tree | f10696d0d38012d45a71420819938ebd6dc05b94 | |
| parent | 1776c75566603d4ecba657e4d4cd67a769ddb43d (diff) | |
| download | scummvm-rg350-cb4caae8eb20f81a6df89d1f1a11b583049409f4.tar.gz scummvm-rg350-cb4caae8eb20f81a6df89d1f1a11b583049409f4.tar.bz2 scummvm-rg350-cb4caae8eb20f81a6df89d1f1a11b583049409f4.zip | |
add constructor to SearchSet::Node for proper init of structure members with gcc 3.4.x (see tracker items #2120595, #2106292)
svn-id: r34686
| -rw-r--r-- | common/archive.cpp | 2 | ||||
| -rw-r--r-- | common/archive.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/common/archive.cpp b/common/archive.cpp index 49e43a5973..11db62cc01 100644 --- a/common/archive.cpp +++ b/common/archive.cpp @@ -234,7 +234,7 @@ void SearchSet::insert(const Node &node) { void SearchSet::add(const String& name, ArchivePtr archive, int priority) { if (find(name) == _list.end()) { - Node node = { priority, name, archive }; + Node node(priority, name, archive); insert(node); } else { warning("SearchSet::add: archive '%s' already present", name.c_str()); diff --git a/common/archive.h b/common/archive.h index 246d9da8cf..b2a2550094 100644 --- a/common/archive.h +++ b/common/archive.h @@ -156,6 +156,9 @@ class SearchSet : public Archive { int _priority; String _name; ArchivePtr _arc; + Node(int priority, const String &name, ArchivePtr arc) + : _priority(priority), _name(name), _arc(arc) { + } }; typedef List<Node> ArchiveList; ArchiveList _list; |