Bug#356436: FTBFS with G++ 4.1: explicit instantiation of 'class BasicList ...

[Ben Hutchings]

tags 356436 +patch
thanks

In standard C++ all declarations for a particular template must be made
in the same namespace.  This patch fixes the compiler errors:

--- nurbs++-3.0.11.orig/nurbs/d_surface.cpp     2002-05-16 16:44:49.000000000 
+0000
+++ nurbs++-3.0.11/nurbs/d_surface.cpp  2006-03-12 03:00:53.000000000 +0000
@@ -25,9 +25,6 @@
   template class InterPoint<double,2> ;
   template class InterPoint<double,3> ;
   
-  template class BasicList<InterPoint<double,2> > ; 
-  template class BasicList<InterPoint<double,3> > ; 
-  
   template class ParaSurface<double,2> ;
   template class ParaSurface<double,3> ;
   
@@ -37,3 +34,8 @@
 #endif 
 
 }
+
+#ifdef NO_IMPLICIT_TEMPLATES
+template class BasicList<PLib::InterPoint<double,2> > ; 
+template class BasicList<PLib::InterPoint<double,3> > ; 
+#endif
--- nurbs++-3.0.11.orig/nurbs/f_surface.cpp     2002-05-16 16:44:49.000000000 
+0000
+++ nurbs++-3.0.11/nurbs/f_surface.cpp  2006-03-12 02:56:53.000000000 +0000
@@ -25,9 +25,6 @@
   template class InterPoint<float,2> ;
   template class InterPoint<float,3> ;
   
-  template class BasicList<InterPoint<float,2> > ; 
-  template class BasicList<InterPoint<float,3> > ; 
-  
   template class ParaSurface<float,2> ;
   template class ParaSurface<float,3> ;
   
@@ -38,3 +35,8 @@
 #endif 
 
 }
+
+#ifdef NO_IMPLICIT_TEMPLATES
+template class BasicList<PLib::InterPoint<float,2> > ; 
+template class BasicList<PLib::InterPoint<float,3> > ; 
+#endif
-- END --

Ben.

-- 
Ben Hutchings
Teamwork is essential - it allows you to blame someone else.

signature.asc
Description: This is a digitally signed message part