[Scummvm-cvs-logs] SF.net SVN: scummvm:[34686] scummvm/trunk/common

cyx at users.sourceforge.net cyx at users.sourceforge.net
Mon Sep 29 21:10:03 CEST 2008


Revision: 34686
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34686&view=rev
Author:   cyx
Date:     2008-09-29 19:09:56 +0000 (Mon, 29 Sep 2008)

Log Message:
-----------
add constructor to SearchSet::Node for proper init of structure members with gcc 3.4.x (see tracker items #2120595, #2106292)

Modified Paths:
--------------
    scummvm/trunk/common/archive.cpp
    scummvm/trunk/common/archive.h

Modified: scummvm/trunk/common/archive.cpp
===================================================================
--- scummvm/trunk/common/archive.cpp	2008-09-29 11:07:39 UTC (rev 34685)
+++ scummvm/trunk/common/archive.cpp	2008-09-29 19:09:56 UTC (rev 34686)
@@ -234,7 +234,7 @@
 
 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());

Modified: scummvm/trunk/common/archive.h
===================================================================
--- scummvm/trunk/common/archive.h	2008-09-29 11:07:39 UTC (rev 34685)
+++ scummvm/trunk/common/archive.h	2008-09-29 19:09:56 UTC (rev 34686)
@@ -156,6 +156,9 @@
 		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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list