Changeset 825966 in git

Timestamp:

Feb 22, 2012, 7:37:52 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1ffd5aaa7f73b96e691b67a5fb6a364a7dfb77d1

Parents:

9840b5050e1851feb2d68a4b74113aa1b59fa12d

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-22 19:37:52+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-23 20:35:08+01:00

Message:

function-to-function/object warnings

fix the warnings using a union hack (misc/auxiliary.h.in)

NOTE: this is a C/C++-standard issue, see http://www.trilithium.com/johan/2004/12/problem-with-dlsym/

Location:

libpolys

Files:

• misc/auxiliary.h.in (modified) (1 diff)
• polys/templates/p_Procs_Dynamic.cc (modified) (3 diffs)
• polys/templates/p_Procs_Set.h (modified) (2 diffs)
• polys/templates/p_Procs_Static.cc (modified) (1 diff)

libpolys/misc/auxiliary.h.in

@@ -426 +426 @@
 #endif
 
+#ifdef __cplusplus
+// hack to workaround warnings when casting void pointers
+// retrieved from dlsym? to function pointers.
+// see: http://trac.osgeo.org/qgis/ticket/234, http://www.trilithium.com/johan/2004/12/problem-with-dlsym/
+template<typename A, typename B>
+inline B cast_A_to_B( A a )
+{
+  union
+  {
+    A a;
+    B b;
+  } u;
+
+  u.a = a;
+  return u.b;
+}
+
+template<typename A>
+inline void* cast_A_to_vptr( A a )
+{
+  return cast_A_to_B<A, void*>(a);
+}
+
+
+template<typename A>
+inline A cast_vptr_to_A( void * p )
+{
+  return cast_A_to_B<void*, A>(p);
+}
+#endif
+
 
 

libpolys/polys/templates/p_Procs_Dynamic.cc

@@ -94 +94 @@
   {
       case p_Copy_Proc:
-        return (void *)p_Copy__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_Copy__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Delete_Proc:
-        return (void *)p_Delete__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_Delete__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_ShallowCopyDelete_Proc:
-        return (void *)p_ShallowCopyDelete__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_ShallowCopyDelete__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Mult_nn_Proc:
-        return (void *)p_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral);
       case pp_Mult_nn_Proc:
-        return (void *)pp_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(pp_Mult_nn__FieldGeneral_LengthGeneral_OrdGeneral);
       case pp_Mult_mm_Proc:
-        return (void *)pp_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(pp_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral);
       case pp_Mult_mm_Noether_Proc:
-        return (void *)pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(pp_Mult_mm_Noether__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Mult_mm_Proc:
-        return (void *)p_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_Mult_mm__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Add_q_Proc:
-        return (void *)p_Add_q__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_Add_q__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Minus_mm_Mult_qq_Proc:
-        return (void *)p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_Minus_mm_Mult_qq__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Neg_Proc:
-        return (void *)p_Neg__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_Neg__FieldGeneral_LengthGeneral_OrdGeneral);
       case pp_Mult_Coeff_mm_DivSelect_Proc:
-        return (void *)pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(pp_Mult_Coeff_mm_DivSelect__FieldGeneral_LengthGeneral_OrdGeneral);
       case pp_Mult_Coeff_mm_DivSelectMult_Proc:
-        return (void *)pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(pp_Mult_Coeff_mm_DivSelectMult__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Merge_q_Proc:
-        return (void *)p_Merge_q__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_Merge_q__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_kBucketSetLm_Proc:
-        return (void *)p_kBucketSetLm__FieldGeneral_LengthGeneral_OrdGeneral;
+        return cast_A_to_vptr(p_kBucketSetLm__FieldGeneral_LengthGeneral_OrdGeneral);
       case p_Unknown_Proc:
         break;
@@ -218 +218 @@
 
 #define DoReallySetProc(what, field, length, ord)           \
-  _p_procs->what = (what##_Proc_Ptr)                        \
-     GetDynamicProc(#what, what##_Proc, field, length, ord)
+  _p_procs->what =    cast_vptr_to_A<what##_Proc_Ptr>(      \
+     GetDynamicProc(#what, what##_Proc, field, length, ord))
 
 #ifdef RDEBUG
@@ -226 +226 @@
 {                                                                   \
   if (set_names)                                                    \
-    _p_procs->what = (what##_Proc_Ptr)                              \
-       GetDynamicProc(#what,  what##_Proc, field, length, ord, 1);  \
+    _p_procs->what =    cast_vptr_to_A<what##_Proc_Ptr>(            \
+       GetDynamicProc(#what,  what##_Proc, field, length, ord, 1));  \
   else                                                              \
     DoReallySetProc(what, field, length, ord);                      \

libpolys/polys/templates/p_Procs_Set.h

@@ -126 +126 @@
 #endif
 
+// (which##_Proc_Ptr)F ->-> cast_vptr_to_A<which##_Proc_Ptr>(F)?
 #define CheckProc(which)                                    \
 do                                                          \
@@ -134 +135 @@
     WarnS("Singular will work properly, but much slower");  \
     WarnS("If you chose a coef ring, it may not work at all");\
-    p_Procs->which = (which##_Proc_Ptr)                     \
-      which##__FieldGeneral_LengthGeneral_OrdGeneral;       \
+    p_Procs->which =                 (which##_Proc_Ptr)(    \
+      which##__FieldGeneral_LengthGeneral_OrdGeneral);       \
   }                                                         \
 }                                                           \

libpolys/polys/templates/p_Procs_Static.cc

@@ -41 +41 @@
 // define DoSetProc and InitSetProcs
 #define SetStaticProcFromArray(what, type, field, length, ord) \
-  _p_procs->what = (what##_Proc_Ptr) \
-    what##_Proc_##type [index(what##_Proc, field, length, ord)]
+  _p_procs->what =            cast_vptr_to_A<what##_Proc_Ptr>( \
+    what##_Proc_##type [index(what##_Proc, field, length, ord)])
 
 #define SetStaticProcFromFuncsArray(what, field, length, ord) \