[Scummvm-cvs-logs] SF.net SVN: scummvm:[48402] scummvm/trunk/engines/m4/mads_views.h

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Mar 25 13:54:55 CET 2010


Revision: 48402
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48402&view=rev
Author:   lordhoto
Date:     2010-03-25 12:54:55 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_views.h

Modified: scummvm/trunk/engines/m4/mads_views.h
===================================================================
--- scummvm/trunk/engines/m4/mads_views.h	2010-03-25 12:46:06 UTC (rev 48401)
+++ scummvm/trunk/engines/m4/mads_views.h	2010-03-25 12:54:55 UTC (rev 48402)
@@ -55,7 +55,7 @@
 
 #define SPRITE_SLOTS_SIZE 50
 
-typedef public Common::Array<Common::SharedPtr<SpriteAsset>> SpriteList;
+typedef Common::Array<Common::SharedPtr<SpriteAsset> > SpriteList;
 
 class MadsSpriteSlots {
 private:


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