Changeset 3831 in Sophya for trunk/SophyaLib/BaseTools

Timestamp:

Aug 5, 2010, 2:16:20 PM (15 years ago)

Author:

ansari

Message:

Introduction et gestion du flag preprocesseur NEED_EXT_DECL_TEMP pour declaration extern des classes template avec instantiation explicite (pb dynamic_cast sur Mac OS 10.6), Reza 05/08/2010

Location:

trunk/SophyaLib/BaseTools

Files:

• machdefs_mkmf.h (modified) (3 diffs)
• ndatablock.cc (modified) (1 diff)
• ndatablock.h (modified) (2 diffs)

trunk/SophyaLib/BaseTools/machdefs_mkmf.h

@@ -145 +145 @@
 /*   DECL_TEMP_SPEC        : Template specialization declaration           */
 /*   TSNMLUPG4             : Two stage name look-up scheme (g++>3.4)       */
+/*   NEED_EXT_DECL_TEMP    : extern declaration for template classes       */
 
 
@@ -175 +176 @@
 #undef TSNMLUPG4
 #endif
+
+
+/*  Dynamic_cast problem encountered on Mac OS X 10.6 for explicitly instanciated classes across
+    dynamic libraries. solved by extern declaration of  explicitly instanciated template classes */
+#ifndef NEED_EXT_DECL_TEMP
+#define NEED_EXT_DECL_TEMP
+#endif
+
 
 /* now the specific things */
@@ -208 +217 @@
 #define __CXX_PRAGMA_TEMPLATES__
 #define PRAGMA_TEMPLATES
+#undef NEED_EXT_DECL_TEMP   /* old compiler version cxx 6.5 - we don't activate extern declaration */
 #endif
 

trunk/SophyaLib/BaseTools/ndatablock.cc

@@ -10 +10 @@
 #include <complex>
 #include "pexceptions.h"
+
+#define NDATABLOCK_CC_BFILE  // avoid extern template declarations 
 #include "ndatablock.h"
+
 #include "thsafeop.h"  //  for ThreadSafe operations (Ref.Count/Share) 
 

trunk/SophyaLib/BaseTools/ndatablock.h

@@ -9 +9 @@
 #include <stdlib.h>        /* pour que size_t soit defini */
 #include "anydataobj.h"
+#include <complex>
 #include <iostream>
 
@@ -236 +237 @@
                       {return a.Div(b);}
 
+//--------- extern template declarations (if needed) -----------
+#if defined ( NEED_EXT_DECL_TEMP ) && !defined( NDATABLOCK_CC_BFILE )
+extern template class NDataBlock<uint_1>;
+extern template class NDataBlock<uint_2>;
+extern template class NDataBlock<int_1>;
+extern template class NDataBlock<int_2>;
+extern template class NDataBlock<int_4>;
+extern template class NDataBlock<int_8>;
+extern template class NDataBlock<uint_4>;
+extern template class NDataBlock<uint_8>;
+extern template class NDataBlock<r_4>;
+extern template class NDataBlock<r_8>;
+extern template class NDataBlock< complex<r_4> >;
+extern template class NDataBlock< complex<r_8> >;
+#ifdef SO_LDBLE128
+extern template class NDataBlock<r_16>;
+extern template class NDataBlock< complex<r_16> >;
+#endif
+
+#endif  // Fin de if defined ( NEED_EXT_DECL_TEMP )
+
 } // Fin du namespace