aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
authorJohannes Schickel2010-03-25 12:54:55 +0000
committerJohannes Schickel2010-03-25 12:54:55 +0000
commitfcc7ab61ac3add71a127be0b503147fa8cc91d47 (patch)
tree100f63ce9785fc8fe3abbdcfaffc3259987f4113 /engines/m4
parentae8853d80bc9e4d6a7f952a76271ad06dd9a3970 (diff)
downloadscummvm-rg350-fcc7ab61ac3add71a127be0b503147fa8cc91d47.tar.gz
scummvm-rg350-fcc7ab61ac3add71a127be0b503147fa8cc91d47.tar.bz2
scummvm-rg350-fcc7ab61ac3add71a127be0b503147fa8cc91d47.zip
Fix compilation by removing a public keyword outside a class scope and using "> >" instead of ">>" for template closing brackets.
Note that ">>" is always operator>> in the current C++ standard, thus one has to use "Common::Array<Common::SharedPtr<SpriteAsset> >" instead of "Common::Array<Common::SharedPtr<SpriteAsset>>" for example. svn-id: r48402
Diffstat (limited to 'engines/m4')
-rw-r--r--engines/m4/mads_views.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/m4/mads_views.h b/engines/m4/mads_views.h
index d2aba31c88..501cc7936c 100644
--- a/engines/m4/mads_views.h
+++ b/engines/m4/mads_views.h
@@ -55,7 +55,7 @@ public:
#define SPRITE_SLOTS_SIZE 50
-typedef public Common::Array<Common::SharedPtr<SpriteAsset>> SpriteList;
+typedef Common::Array<Common::SharedPtr<SpriteAsset> > SpriteList;
class MadsSpriteSlots {
private: