[Gnash-commit] gnash ChangeLog server/character.cpp server/cha...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/02/22 20:08:51

Modified files:
        .              : ChangeLog 
        server         : character.cpp character.h 

Log message:
                * server/character.{cpp,h}: static data members may not be 
defined
                  in a class declaration.
        
        This causes linking problems in some cases; what happens when it doesn't
        is unclear.
        
                * libbase/rc.cpp: use <limits> and numeric_limits<>::max().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5730&r2=1.5731
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.128&r2=1.129

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5730
retrieving revision 1.5731
diff -u -b -r1.5730 -r1.5731
--- ChangeLog   22 Feb 2008 18:28:31 -0000      1.5730
+++ ChangeLog   22 Feb 2008 20:08:50 -0000      1.5731
@@ -1,13 +1,19 @@
+2008-02-22 Benjamin Wolsey <address@hidden>
+
+       * server/character.{cpp,h}: static data members may not be defined
+         in a class declaration.
+       * libbase/rc.cpp: use <limits> and numeric_limits<>::max().
+
 2008-02-22 Markus Gothe <address@hidden>
 
        * gui/gnash.cpp: Changed 2007 -> 2008.
 
-2008-02-20 Bastiaan Jacques <address@hidden>
+2008-02-22 Bastiaan Jacques <address@hidden>
 
        * libmedia/gst/VideoDecoderGst.cpp: Be more verbose about a missing
        gstreamer-ffmpeg.
 
-2008-02-20 Bastiaan Jacques <address@hidden>
+2008-02-22 Bastiaan Jacques <address@hidden>
 
        * configure.ac: Check for gst_install_plugins_async, since that's the
        function we really need.

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/character.cpp        19 Feb 2008 19:20:53 -0000      1.79
+++ server/character.cpp        22 Feb 2008 20:08:51 -0000      1.80
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.79 2008/02/19 19:20:53 bwy Exp $ */
+/* $Id: character.cpp,v 1.80 2008/02/22 20:08:51 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -43,6 +43,9 @@
 // Initialize unnamed instance count
 unsigned int character::_lastUnnamedInstanceNum=0;
 
+const int character::staticDepthOffset = -16384;
+const int character::removedDepthOffset = -32769; 
+
 /*protected static*/
 std::string
 character::getNextUnnamedInstanceName()

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/character.h  16 Feb 2008 23:12:58 -0000      1.128
+++ server/character.h  22 Feb 2008 20:08:51 -0000      1.129
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: character.h,v 1.128 2008/02/16 23:12:58 rsavoye Exp $ */
+/* $Id: character.h,v 1.129 2008/02/22 20:08:51 bwy Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -308,7 +308,7 @@
     ///
     /// See: http://www.senocular.com/flash/tutorials/depths/?page=2
     ///
-    static const int staticDepthOffset = -16384;
+    static const int staticDepthOffset;
 
     /// This is the offset at which character's depth is
     /// shifted when a character is removed from stage but
@@ -326,7 +326,7 @@
     ///        (all of the above correct?)
     ///
     ///
-    static const int removedDepthOffset = -32769; 
+    static const int removedDepthOffset; 
 
     /// Return true if the given depth is in the removed zone
     static bool depthInRemovedZone(int depth)