CVSROOT: /sources/gnash
Module name: gnash
Changes by: Eric Hughes <eh9> 07/10/21 20:24:00
Modified files:
cygnal/unit_tests: Change_Log.txt Makefile.am Permutation.hpp
Random_Permutation.hpp Test_Support.hpp
Log message:
-- Modifications to cygnal-wide unit test support for gcc compliance.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/unit_tests/Change_Log.txt?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/unit_tests/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/unit_tests/Permutation.hpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/unit_tests/Random_Permutation.hpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/unit_tests/Test_Support.hpp?cvsroot=gnash&r1=1.3&r2=1.4
Patches:
Index: Change_Log.txt
===================================================================
RCS file: /sources/gnash/gnash/cygnal/unit_tests/Change_Log.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Change_Log.txt 3 Oct 2007 15:29:17 -0000 1.2
+++ Change_Log.txt 21 Oct 2007 20:24:00 -0000 1.3
@@ -1,6 +1,11 @@
Change Log for GNU Cygnal, Module ACT
=====================================
+2007-10-21 Eric Hughes <[EMAIL PROTECTED]>
+ * {Permutation,Random_Permutation}.hpp: Rearranged member variables to
eliminate gcc order-of-initialization warning.
+ * Test_Support.hpp: Added trivial virtual destructor for
concrete_generator. Added a couple of typename declarations.
+ * Makefile.am: Removed unneeded libraries. Changed library file name.
+
2007-08-28 Eric Hughes <[EMAIL PROTECTED]>
* main.cpp: Use cygnal_test.hpp in this file, replacing the boost
header that migrated there.
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/cygnal/unit_tests/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Makefile.am 14 Jul 2007 19:19:51 -0000 1.1
+++ Makefile.am 21 Oct 2007 20:24:00 -0000 1.2
@@ -15,8 +15,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+# $Id: Makefile.am,v 1.2 2007/10/21 20:24:00 eh9 Exp $
-## Process this file with automake to generate Makefile.in
+#----------------------------------------
+# Makefile.am for Cygnal/unit_tests
+#----------------------------------------
AUTOMAKE_OPTIONS = #dejagnu
@@ -25,32 +28,17 @@
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
- ../../libbase/libgnashbase.la \
- ../../libamf/libgnashamf.la \
- $(LIBLTDL) \
$(GLIB_LIBS) \
- $(LIBXML_LIBS) \
- $(CURL_LIBS) \
- $(BOOST_LIBS) \
- $(PTHREAD_LIBS)
+ $(BOOST_LIBS)
localedir = $(datadir)/locale
-INCLUDES = -I.. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/cygnal \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/server \
+INCLUDES = -I$(top_srcdir)/cygnal \
-DLOCALEDIR=\"$(localedir)\" \
- $(LIBXML_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- $(CURL_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(PTHREAD_CFLAGS)
+ $(BOOST_CFLAGS)
-lib_LTLIBRARIES = libcygnaltest.la
-libcygnaltest_la_SOURCES= \
+lib_LTLIBRARIES = libcygnal_test.la
+libcygnal_test_la_SOURCES= \
Random_Permutation.cpp \
Test_Support.cpp \
main.cpp
Index: Permutation.hpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/unit_tests/Permutation.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Permutation.hpp 3 Oct 2007 15:29:17 -0000 1.5
+++ Permutation.hpp 21 Oct 2007 20:24:00 -0000 1.6
@@ -42,9 +42,9 @@
typedef boost::function< void( const_iterator, const_iterator ) >
test_function_type ;
private:
vector_type the_vector ;
+ test_function_type f ;
bool at_end ;
bool at_begin ;
- test_function_type f ;
const_iterator begin() { return at_end ? the_vector.end() :
the_vector.begin() ; }
const_iterator end() { return the_vector.end() ; }
Index: Random_Permutation.hpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/unit_tests/Random_Permutation.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Random_Permutation.hpp 21 Jul 2007 17:51:21 -0000 1.3
+++ Random_Permutation.hpp 21 Oct 2007 20:24:00 -0000 1.4
@@ -107,12 +107,12 @@
typedef const random_permutation_iterator const_iterator ;
typedef random_permutation_iterator::test_function_type
test_function_type ;
private:
+ test_function_type f ;
+
unsigned int n ;
unsigned int number_of_iterations ;
- test_function_type f ;
-
public:
random_permutation( test_function_type f, unsigned int n, unsigned int
number_of_iterations )
: f( f ), n( n ), number_of_iterations( number_of_iterations )
{}
Index: Test_Support.hpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/unit_tests/Test_Support.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Test_Support.hpp 10 Jul 2007 14:09:11 -0000 1.3
+++ Test_Support.hpp 21 Oct 2007 20:24:00 -0000 1.4
@@ -101,6 +101,9 @@
concrete_generator( Iter begin, Iter end )
: begin( begin ), end( end )
{}
+
+ /// Trivial virtual destructor
+ virtual ~concrete_generator() {}
} ;
//--------------------------------------------------
@@ -139,8 +142,8 @@
template< class Gen >
auto_generator make_generator( Gen generator_instance, std::string name )
{
- shared_ptr< concrete_generator< Gen::iterator > >
- g( new concrete_generator< Gen::iterator >(
generator_instance.begin(), generator_instance.end() ) ) ;
+ shared_ptr< concrete_generator< typename Gen::iterator > >
+ g( new concrete_generator< typename Gen::iterator >(
generator_instance.begin(), generator_instance.end() ) ) ;
return auto_generator( g, name ) ;
}
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
