fixed order of template type declarations

Author: molpopgen

fwdpp/sugar/metapop/metapop.hpp

@@ -191,8 +191,8 @@ namespace KTfwd {
 	     typename mvector,
 	     typename ftvector,
 	     typename lookup_table_type,
-	     typename dip_reader_t = KTfwd::diploidIOplaceholder,
-	     typename dip_writer_t = KTfwd::diploidIOplaceholder>
+	     typename dip_writer_t = KTfwd::diploidIOplaceholder,
+	     typename dip_reader_t = KTfwd::diploidIOplaceholder>
     class metapop_serialized
     {
       static_assert( std::is_same< typename glist::value_type,

fwdpp/sugar/multiloc/multiloc.hpp

@@ -130,12 +130,11 @@ namespace KTfwd {
 	     typename mlist,
 	     typename glist,
 	     typename dipvector,
-	     //typename vglist,
 	     typename mvector,
 	     typename ftvector,
 	     typename lookup_table_type,
-	     typename dip_reader_t = KTfwd::diploidIOplaceholder,
-	     typename dip_writer_t = KTfwd::diploidIOplaceholder>
+	     typename dip_writer_t = KTfwd::diploidIOplaceholder,
+	     typename dip_reader_t = KTfwd::diploidIOplaceholder>
     struct multiloc_serialized
     {
       //Dispatch tags for other parts of sugar layer