[Gnash-commit] gnash ChangeLog cygnal/ACT/ACT.cpp cygnal/ACT/A...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/18 14:14:12

Modified files:
        .              : ChangeLog 
        cygnal/ACT     : ACT.cpp ACT.hpp Handle.hpp 

Log message:
                * cygnal/ACT/ACT.{cpp,hpp}: throw runtime_error if in need for a
                  message string (std::exception ctor doesn't accept a string 
arg)
                * cygnal/ACT/Handle.hpp: fix *a few* build errors, more 
available.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3760&r2=1.3761
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/ACT/ACT.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/ACT/ACT.hpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/ACT/Handle.hpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3760
retrieving revision 1.3761
diff -u -b -r1.3760 -r1.3761
--- ChangeLog   18 Jul 2007 13:47:00 -0000      1.3760
+++ ChangeLog   18 Jul 2007 14:14:08 -0000      1.3761
@@ -1,5 +1,8 @@
 2007-07-18 Sandro Santilli <address@hidden>
 
+       * cygnal/ACT/ACT.{cpp,hpp}: throw runtime_error if in need for a
+         message string (std::exception ctor doesn't accept a string arg)
+       * cygnal/ACT/Handle.hpp: fix *a few* build errors, more available.
        * cygnal/Makefile.am: Add all subdirs to SUBDIRS. Fixes bug #20509.
 
 2007-07-18 Sandro Santilli <address@hidden>

Index: cygnal/ACT/ACT.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/ACT/ACT.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cygnal/ACT/ACT.cpp  1 Jul 2007 10:53:50 -0000       1.2
+++ cygnal/ACT/ACT.cpp  18 Jul 2007 14:14:10 -0000      1.3
@@ -22,6 +22,9 @@
 
 #include "ACT.hpp"
 
+#include <stdexcept>
+#include <string>
+
 namespace ACT {
        act::
        act( basic_act * x )
@@ -30,7 +33,7 @@
                if ( x == 0 ) {
                        // The recommended expression for our input parameter 
is 'new X',
                        //              which motivates the text of the 
exception
-                       throw std::exception( "Probable memory allocation 
error" ) ;
+                       throw std::runtime_error( "Probable memory allocation 
error" ) ;
                }
        }
 

Index: cygnal/ACT/ACT.hpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/ACT/ACT.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: cygnal/ACT/Handle.hpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/ACT/Handle.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cygnal/ACT/Handle.hpp       10 Jul 2007 14:09:08 -0000      1.1
+++ cygnal/ACT/Handle.hpp       18 Jul 2007 14:14:12 -0000      1.2
@@ -46,7 +46,7 @@
        class Handle
        {
                // friend classes
-               template< class T, class Marker > friend class 
Vector_with_Handle_Index ;
+               template< class nT, class nMarker > friend class 
Vector_with_Handle_Index ;
 
                /// A handle is an encapsulated integral type
                T the_index ;
@@ -81,6 +81,12 @@
                : public std::vector< T >
        {
                typedef std::vector< T > Base ;         /// Our base class, 
defined for legibility.
+
+               // These might not be needed using private inheritance, but 
didn't try
+               typedef typename Base::reference reference ;
+               typedef typename Base::const_reference const_reference ;
+               typedef typename Base::size_type size_type ;
+
                inline reference operator[]( size_type n ) { throw 
std::exception() ; }                         /// Prohibit offset operation with 
unwrapped index
                inline const_reference operator[]( size_type n ) const { throw 
std::exception() ; }     /// Prohibit offset operation with unwrapped index
                inline reference at( size_type n ) { throw std::exception() ; } 
                                        /// Prohibit offset operation with 
unwrapped index