head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.40 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.38 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.36 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.34 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.32 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.30 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.28 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.26 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.24 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.22 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.20 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.18 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.16 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.14 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.12 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.10 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.8 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.6 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.4 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.2 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2; locks; strict; comment @# @; 1.3 date 2005.08.22.15.35.37; author adam; state dead; branches; next 1.2; 1.2 date 2005.05.06.00.03.25; author salo; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2005.04.20.00.58.08; author heinz; state Exp; branches; next ; 1.2.2.1 date 2005.05.06.00.03.25; author salo; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2005.05.06.00.30.17; author salo; state Exp; branches; next ; desc @@ 1.3 log @Changes 0.92: * Added Spanish translation * Fixed bug: ice is now working * A few smaller bug fixes Changes 0.91: * Fixed stupid bugs in Enigma 0.90 * Two new levels Changes 0.90: * New levels * Support for 800x600 and 1024x768 video modes * Support for non-English languages * Vastly improved Oxyd 1 and Per.Oxyd compatibility * Redesigned options menu * Countless smaller enhancements @ text @$NetBSD: patch-al,v 1.2 2005/05/06 00:03:25 salo Exp $ --- src/px/array2.hh 2003-05-19 14:14:36.000000000 +0200 +++ src/px/array2.hh 2004-11-11 00:04:26.855388248 +0100 @@@@ -70,14 +70,14 @@@@ // Destructor ~Array2() { destroy_elements(); } - iterator begin() { return first; } - iterator end() { return last; } - const_iterator begin() const { return first; } - const_iterator end() const { return last; } - iterator row_begin(size_type y) { return first + y*w; } - iterator row_end(size_type y) { return first + y*w + w; } - const_iterator row_begin(size_type y) const { return first + y*w; } - const_iterator row_end(size_type y) const { return first + y*w + w; } + iterator begin() { return this->first; } + iterator end() { return this->last; } + const_iterator begin() const { return this->first; } + const_iterator end() const { return this->last; } + iterator row_begin(size_type y) { return this->first + y*w; } + iterator row_end(size_type y) { return this->first + y*w + w; } + const_iterator row_begin(size_type y) const { return this->first + y*w; } + const_iterator row_end(size_type y) const { return this->first + y*w + w; } void swap(Array2 &a2); @@@@ -86,13 +86,13 @@@@ size_type height()const { return h; } - T& get(size_type x, size_type y) { return first[y*w+x]; } - const T& get(size_type x, size_type y) const { return first[y*w+x]; } + T& get(size_type x, size_type y) { return this->first[y*w+x]; } + const T& get(size_type x, size_type y) const { return this->first[y*w+x]; } T& operator()(size_type x, size_type y) { return get(x,y); } const T& operator()(size_type x, size_type y) const { return get(x,y); } void set(size_type x, size_type y, const T& val) { - first[y*w+x] = val; + this->first[y*w+x] = val; } /*! Fill the array with some value or the default value. */ @@@@ -112,19 +112,19 @@@@ Array2::Array2(int ww, int hh, const T& val, const A& a) : Array2Base(a, ww*hh), w(ww), h(hh) { - std::uninitialized_fill(first, last, val); + std::uninitialized_fill(this->first, this->last, val); } template Array2::Array2(const Array2 &a) : Array2Base(a.alloc, a.last-a.first) { - std::uninitialized_copy(a.begin(), a.end(), first); + std::uninitialized_copy(a.begin(), a.end(), this->first); } template void Array2::destroy_elements() { - for (T* p=first; p!=last; ++p) + for (T* p=this->first; p!=this->last; ++p) p->~T(); } @@@@ -132,7 +132,7 @@@@ void Array2::fill (const T& val) { destroy_elements(); - std::uninitialized_fill(first, last, val); + std::uninitialized_fill(this->first, this->last, val); } /*! Resize the array in place, but discard any old array @@@@ -142,7 +142,7 @@@@ { destroy_elements(); Array2Base::resize(w_*h_); - std::uninitialized_fill(first, last, val); + std::uninitialized_fill(this->first, this->last, val); w = w_; h = h_; } @@@@ -150,8 +150,8 @@@@ template void Array2::swap(Array2 &a2) { - std::swap(first, a2.first); - std::swap(last, a2.last); + std::swap(this->first, a2.first); + std::swap(this->last, a2.last); std::swap(w, a2.w); std::swap(h, a2.h); } @ 1.2 log @Add RCSIDs, remove diff command line. (hi heinz!) @ text @d1 1 a1 1 $NetBSD$ @ 1.2.2.1 log @file patch-al was added on branch pkgsrc-2005Q1 on 2005-05-06 00:03:25 +0000 @ text @d1 96 @ 1.2.2.2 log @Pullup ticket 472 - requested by Klaus Heinz gcc fixes for enigma Revisions pulled up: - pkgsrc/games/enigma/Makefile 1.9 - pkgsrc/games/enigma/distinfo 1.3-1.4 - pkgsrc/games/enigma/patches/patch-aj 1.1-1.2 - pkgsrc/games/enigma/patches/patch-ak 1.1-1.2 - pkgsrc/games/enigma/patches/patch-al 1.1-1.2 - pkgsrc/games/enigma/patches/patch-am 1.1-1.2 - pkgsrc/games/enigma/patches/patch-an 1.1-1.2 Module Name: pkgsrc Committed By: heinz Date: Wed Apr 20 00:58:08 UTC 2005 Modified Files: pkgsrc/games/enigma: Makefile distinfo Added Files: pkgsrc/games/enigma/patches: patch-aj patch-ak patch-al patch-am patch-an Log Message: Applied patches found at http://bugzilla.fedora.us/attachment.cgi?id=3D919&action=3Dview as patch-aj .. patch-an in order to fix PR pkg/29385. Patch-am was changed slightly: a white-space-only change was omitted and the comments from two "friend" declarations were removed in order to not break support for gcc 2.95. --- Module Name: pkgsrc Committed By: salo Date: Fri May 6 00:03:25 UTC 2005 Modified Files: pkgsrc/games/enigma: distinfo pkgsrc/games/enigma/patches: patch-aj patch-ak patch-al patch-am patch-an Log Message: Add RCSIDs, remove diff command line. (hi heinz!) @ text @a0 96 $NetBSD: patch-al,v 1.2.2.1 2005/05/06 00:30:17 salo Exp $ --- src/px/array2.hh 2003-05-19 14:14:36.000000000 +0200 +++ src/px/array2.hh 2004-11-11 00:04:26.855388248 +0100 @@@@ -70,14 +70,14 @@@@ // Destructor ~Array2() { destroy_elements(); } - iterator begin() { return first; } - iterator end() { return last; } - const_iterator begin() const { return first; } - const_iterator end() const { return last; } - iterator row_begin(size_type y) { return first + y*w; } - iterator row_end(size_type y) { return first + y*w + w; } - const_iterator row_begin(size_type y) const { return first + y*w; } - const_iterator row_end(size_type y) const { return first + y*w + w; } + iterator begin() { return this->first; } + iterator end() { return this->last; } + const_iterator begin() const { return this->first; } + const_iterator end() const { return this->last; } + iterator row_begin(size_type y) { return this->first + y*w; } + iterator row_end(size_type y) { return this->first + y*w + w; } + const_iterator row_begin(size_type y) const { return this->first + y*w; } + const_iterator row_end(size_type y) const { return this->first + y*w + w; } void swap(Array2 &a2); @@@@ -86,13 +86,13 @@@@ size_type height()const { return h; } - T& get(size_type x, size_type y) { return first[y*w+x]; } - const T& get(size_type x, size_type y) const { return first[y*w+x]; } + T& get(size_type x, size_type y) { return this->first[y*w+x]; } + const T& get(size_type x, size_type y) const { return this->first[y*w+x]; } T& operator()(size_type x, size_type y) { return get(x,y); } const T& operator()(size_type x, size_type y) const { return get(x,y); } void set(size_type x, size_type y, const T& val) { - first[y*w+x] = val; + this->first[y*w+x] = val; } /*! Fill the array with some value or the default value. */ @@@@ -112,19 +112,19 @@@@ Array2::Array2(int ww, int hh, const T& val, const A& a) : Array2Base(a, ww*hh), w(ww), h(hh) { - std::uninitialized_fill(first, last, val); + std::uninitialized_fill(this->first, this->last, val); } template Array2::Array2(const Array2 &a) : Array2Base(a.alloc, a.last-a.first) { - std::uninitialized_copy(a.begin(), a.end(), first); + std::uninitialized_copy(a.begin(), a.end(), this->first); } template void Array2::destroy_elements() { - for (T* p=first; p!=last; ++p) + for (T* p=this->first; p!=this->last; ++p) p->~T(); } @@@@ -132,7 +132,7 @@@@ void Array2::fill (const T& val) { destroy_elements(); - std::uninitialized_fill(first, last, val); + std::uninitialized_fill(this->first, this->last, val); } /*! Resize the array in place, but discard any old array @@@@ -142,7 +142,7 @@@@ { destroy_elements(); Array2Base::resize(w_*h_); - std::uninitialized_fill(first, last, val); + std::uninitialized_fill(this->first, this->last, val); w = w_; h = h_; } @@@@ -150,8 +150,8 @@@@ template void Array2::swap(Array2 &a2) { - std::swap(first, a2.first); - std::swap(last, a2.last); + std::swap(this->first, a2.first); + std::swap(this->last, a2.last); std::swap(w, a2.w); std::swap(h, a2.h); } @ 1.1 log @Applied patches found at http://bugzilla.fedora.us/attachment.cgi?id=919&action=view as patch-aj .. patch-an in order to fix PR pkg/29385. Patch-am was changed slightly: a white-space-only change was omitted and the comments from two "friend" declarations were removed in order to not break support for gcc 2.95. @ text @d1 2 a2 1 diff -Nur enigma-0.81-orig/src/px/array2.hh enigma-0.81/src/px/array2.hh @