[Scummvm-cvs-logs] SF.net SVN: scummvm:[53385] scummvm/trunk/engines/sword25/gfx/image

[sev at users.sourceforge.net]

Revision: 53385
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53385&view=rev
Author:   sev
Date:     2010-10-13 00:05:09 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
SWORD25: Stop polluting global namespace

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/image/art.cpp
    scummvm/trunk/engines/sword25/gfx/image/art.h

Modified: scummvm/trunk/engines/sword25/gfx/image/art.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/art.cpp	2010-10-13 00:04:40 UTC (rev 53384)
+++ scummvm/trunk/engines/sword25/gfx/image/art.cpp	2010-10-13 00:05:09 UTC (rev 53385)
@@ -36,6 +36,8 @@
 
 #include "art.h"
 
+namespace Sword25 {
+
 /**
  * art_die: Print the error message to stderr and exit with a return code of 1.
  * @fmt: The printf-style format for the error message.
@@ -2645,3 +2647,5 @@
 
 	art_svp_render_aa_iter_done(iter);
 }
+
+} // End of namespace Sword25

Modified: scummvm/trunk/engines/sword25/gfx/image/art.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/art.h	2010-10-13 00:04:40 UTC (rev 53384)
+++ scummvm/trunk/engines/sword25/gfx/image/art.h	2010-10-13 00:05:09 UTC (rev 53385)
@@ -35,11 +35,13 @@
 /* Simple macros to set up storage allocation and basic types for libart
    functions. */
 
-#ifndef __ART_MISC_H__
-#define __ART_MISC_H__
+#ifndef __ART_H__
+#define __ART_H__
 
 #include "common/scummsys.h"
 
+namespace Sword25 {
+
 typedef byte art_u8;
 typedef uint16 art_u16;
 typedef uint32 art_u32;
@@ -272,5 +274,6 @@
                                    ArtSVPRenderAAStep *steps, int n_steps),
                   void *callback_data);
 
+} // End of namespace Sword25
 
-#endif /* __ART_MISC_H__ */
+#endif /* __ART_H__ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.