[Scummvm-cvs-logs] SF.net SVN: scummvm: [24298] scummvm/trunk/common
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Fri Oct 13 22:18:34 CEST 2006
Revision: 24298
http://svn.sourceforge.net/scummvm/?rev=24298&view=rev
Author: lordhoto
Date: 2006-10-13 13:18:27 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
Fixes compiling for me with g++ (GCC) 4.1.2 20061007 (prerelease) (Debian 4.1.1-16) on amd64.
Modified Paths:
--------------
scummvm/trunk/common/array.h
scummvm/trunk/common/list.h
Modified: scummvm/trunk/common/array.h
===================================================================
--- scummvm/trunk/common/array.h 2006-10-13 13:32:15 UTC (rev 24297)
+++ scummvm/trunk/common/array.h 2006-10-13 20:18:27 UTC (rev 24298)
@@ -39,8 +39,8 @@
typedef const T *const_iterator;
public:
- Array<T>() : _capacity(0), _size(0), _data(0) {}
- Array<T>(const Array<T>& array) : _capacity(0), _size(0), _data(0) {
+ Array() : _capacity(0), _size(0), _data(0) {}
+ Array(const Array<T>& array) : _capacity(0), _size(0), _data(0) {
_size = array._size;
_capacity = _size + 32;
_data = new T[_capacity];
@@ -48,12 +48,7 @@
_data[i] = array._data[i];
}
-#ifdef __SYMBIAN32__
- ~Array()
-#else
- ~Array<T>()
-#endif
- {
+ ~Array() {
if (_data)
delete [] _data;
}
Modified: scummvm/trunk/common/list.h
===================================================================
--- scummvm/trunk/common/list.h 2006-10-13 13:32:15 UTC (rev 24297)
+++ scummvm/trunk/common/list.h 2006-10-13 20:18:27 UTC (rev 24298)
@@ -47,7 +47,7 @@
struct Node : public NodeBase {
T2 _data;
- Node<T2>(const T2 &x) : _data(x) {}
+ Node(const T2 &x) : _data(x) {}
};
template <class T2>
@@ -56,13 +56,13 @@
NodeBase *_node;
#if !defined (PALMOS_MODE) && !defined (__WINSCW__)
- explicit Iterator<T2>(NodeBase *node) : _node(node) {}
+ explicit Iterator(NodeBase *node) : _node(node) {}
#else
- Iterator<T2>(NodeBase *node) : _node(node) {}
+ Iterator(NodeBase *node) : _node(node) {}
#endif
public:
- Iterator<T2>() : _node(0) {}
+ Iterator() : _node(0) {}
// Prefix inc
Iterator<T2> &operator++() {
@@ -116,12 +116,12 @@
typedef Iterator<const T> const_iterator;
public:
- List<T>() {
+ List() {
_anchor = new NodeBase;
_anchor->_prev = _anchor;
_anchor->_next = _anchor;
}
- List<T>(const List<T>& list) {
+ List(const List<T>& list) {
_anchor = new NodeBase;
_anchor->_prev = _anchor;
_anchor->_next = _anchor;
@@ -129,12 +129,7 @@
insert(begin(), list.begin(), list.end());
}
-#ifndef __SYMBIAN32__
- ~List<T>()
-#else
- ~List()
-#endif
- {
+ ~List() {
clear();
delete _anchor;
}
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