mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilations problems in g++ 4.2.1 (Mac OS X)

Browse Source
This commit is contained in:
David Capello 2014-01-05 16:43:39 -03:00
parent 2a2c668e4f
commit 5bbe6c6086
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/context_access.h
View File

@ -77,7 +77,7 @@ namespace app {
class ContextReader : public ContextAccess<DocumentReader> {
public:
ContextReader(const Context* context)
: ContextAccess(context) {
: ContextAccess<DocumentReader>(context) {
}
};
@ -86,11 +86,11 @@ namespace app {
class ContextWriter : public ContextAccess<DocumentWriter> {
public:
ContextWriter(const Context* context)
: ContextAccess(context) {
: ContextAccess<DocumentWriter>(context) {
}
ContextWriter(const ContextReader& reader)
: ContextAccess(reader.context(), reader.document()) {
: ContextAccess<DocumentWriter>(reader.context(), reader.document()) {
}
};

12
src/raster/image_iterator.h
View File

@ -486,11 +486,15 @@ namespace raster {
uint8_t*,
BitPixelAccess&> {
public:
typedef ImageIteratorT<BitmapTraits,
uint8_t*,
BitPixelAccess&> Base;
ImageIterator() {
}
ImageIterator(const Image* image, const gfx::Rect& bounds, int x, int y) :
ImageIteratorT(image, bounds, x, y) {
Base(image, bounds, x, y) {
}
};
@ -499,11 +503,15 @@ namespace raster {
uint8_t const*,
const BitPixelAccess&> {
public:
typedef ImageIteratorT<BitmapTraits,
uint8_t const*,
const BitPixelAccess&> Base;
ImageConstIterator() {
}
ImageConstIterator(const Image* image, const gfx::Rect& bounds, int x, int y) :
ImageIteratorT(image, bounds, x, y) {
Base(image, bounds, x, y) {
}
};