Bläddra i källkod

*** empty log message ***

David Rose 24 år sedan
förälder
incheckning
ed1b771c26
2 ändrade filer med 6 tillägg och 0 borttagningar
  1. 2 0
      dtool/src/dtoolutil/vector_src.cxx
  2. 4 0
      dtool/src/dtoolutil/vector_src.h

+ 2 - 0
dtool/src/dtoolutil/vector_src.cxx

@@ -32,11 +32,13 @@
 //
 //
 // They will automatically be undefined at the end of the file.
 // They will automatically be undefined at the end of the file.
 
 
+/*
 void 
 void 
 insert_into_vector(NAME &vec, NAME::iterator where,
 insert_into_vector(NAME &vec, NAME::iterator where,
 		   NAME::const_pointer begin, NAME::const_pointer end) {
 		   NAME::const_pointer begin, NAME::const_pointer end) {
   vec.insert(where, begin, end);
   vec.insert(where, begin, end);
 }
 }
+*/
 
 
 #undef EXPCL
 #undef EXPCL
 #undef EXPTP
 #undef EXPTP

+ 4 - 0
dtool/src/dtoolutil/vector_src.h

@@ -40,11 +40,13 @@
 // With the Dinkum library, we must first export the base class,
 // With the Dinkum library, we must first export the base class,
 // _Vector_val.
 // _Vector_val.
     #define VV_BASE std::_Vector_val<TYPE, std::allocator<TYPE> >
     #define VV_BASE std::_Vector_val<TYPE, std::allocator<TYPE> >
+#pragma warning (disable : 4231)
 EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, VV_BASE)
 EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, VV_BASE)
     #undef VV_BASE
     #undef VV_BASE
   #endif
   #endif
 
 
 // Now we can export the vector class.
 // Now we can export the vector class.
+#pragma warning (disable : 4231)
 EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, std::vector<TYPE>)
 EXPORT_TEMPLATE_CLASS(EXPCL, EXPTP, std::vector<TYPE>)
 
 
 #endif
 #endif
@@ -57,9 +59,11 @@ typedef std::vector<TYPE> NAME;
   // the Dinkum STL implementation uses member templates to handle
   // the Dinkum STL implementation uses member templates to handle
   // this, but we cannot export the member templates from the DLL.
   // this, but we cannot export the member templates from the DLL.
 
 
+/*
 extern EXPCL void
 extern EXPCL void
 insert_into_vector(NAME &vec, NAME::iterator where,
 insert_into_vector(NAME &vec, NAME::iterator where,
 		   const TYPE *begin, const TYPE *end);
 		   const TYPE *begin, const TYPE *end);
+*/
 
 
 
 
 #undef EXPCL
 #undef EXPCL