[GH #70] Enable clang++ compilation, proper function ptr casts

Also fix a wrong C++ precedence: & has lower precedence than ==; == will be evaluated first [-Wparentheses]

Author: Reini Urban

3rdparty/libtommath/bn_error.c

@@ -25,14 +25,14 @@ static const struct {
 };
 
 /* return a char * string for a given code */
-char *mp_error_to_string(int code)
+const char *mp_error_to_string(int code)
 {
    int x;
 
    /* scan the lookup table for the given message */
    for (x = 0; x < (int)(sizeof(msgs) / sizeof(msgs[0])); x++) {
        if (msgs[x].code == code) {
-          return msgs[x].msg;
+           return msgs[x].msg;
        }
    }
 

3rdparty/libtommath/tommath.h

@@ -190,7 +190,7 @@ typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat);
 #define SIGN(m)    ((m)->sign)
 
 /* error code to char* string */
-char *mp_error_to_string(int code);
+const char *mp_error_to_string(int code);
 
 /* ---> init and deinit bignum functions <--- */
 /* init a bignum */

src/6model/repr_registry.c

@@ -174,7 +174,7 @@ static void register_repr(PARROT_INTERP, STRING *name, REPROps *repr) {
 /* Dynamically registers a representation (that is, one defined outside of
  * the 6model core). */
 static INTVAL REPR_register_dynamic(PARROT_INTERP, STRING *name, REPROps * (*reg) (PARROT_INTERP, void *, void *)) {
-    REPROps *repr = reg(interp, wrap_object, create_stable);
+    REPROps *repr = reg(interp, (void*)wrap_object, (void*)create_stable);
     register_repr(interp, name, repr);
     return repr->ID;
 }
@@ -206,7 +206,7 @@ void REPR_initialize_registry(PARROT_INTERP) {
 
     /* Set up object for dynamically registering extra representations. */
     dyn_reg_func = Parrot_pmc_new(interp, enum_class_Pointer);
-    VTABLE_set_pointer(interp, dyn_reg_func, REPR_register_dynamic);
+    VTABLE_set_pointer(interp, dyn_reg_func, (void*)REPR_register_dynamic);
     VTABLE_set_pmc_keyed_str(interp, interp->root_namespace,
         Parrot_str_new_constant(interp, "_REGISTER_REPR"), dyn_reg_func);
 }

src/guts/multi_dispatch.c

@@ -282,7 +282,7 @@ static NQP_md_cache *get_dispatch_cache(PARROT_INTERP, PMC *dispatcher) {
     if (dispatcher->vtable->base_type == enum_class_Sub && PARROT_SUB(dispatcher)->multi_signature->vtable->base_type == smo_id) {
         NQP_Routine *r = (NQP_Routine *)PMC_data(PARROT_SUB(dispatcher)->multi_signature);
         if (PMC_IS_NULL(r->dispatch_cache)) {
-            NQP_md_cache *c = mem_sys_allocate_zeroed(sizeof(NQP_md_cache));
+	  NQP_md_cache *c = (NQP_md_cache *)mem_sys_allocate_zeroed(sizeof(NQP_md_cache));
             cache_ptr = Parrot_pmc_new(interp, enum_class_Pointer);
             VTABLE_set_pointer(interp, cache_ptr, c);
             r->dispatch_cache = cache_ptr;
@@ -401,8 +401,8 @@ add_to_cache(PARROT_INTERP, NQP_md_cache *cache, PMC *capture, INTVAL num_args,
 
     /* If there's no entries yet, need to do some allocation. */
     if (entries == 0) {
-        cache->arity_caches[num_args - 1].type_ids = mem_sys_allocate(num_args * sizeof(INTVAL) * MD_CACHE_MAX_ENTRIES);
-        cache->arity_caches[num_args - 1].results  = mem_sys_allocate(sizeof(PMC *) * MD_CACHE_MAX_ENTRIES);
+      cache->arity_caches[num_args - 1].type_ids = (INTVAL *)mem_sys_allocate(num_args * sizeof(INTVAL) * MD_CACHE_MAX_ENTRIES);
+        cache->arity_caches[num_args - 1].results  = (PMC **)mem_sys_allocate(sizeof(PMC *) * MD_CACHE_MAX_ENTRIES);
     }
 
     /* Add entry. */

src/ops/nqp.ops

@@ -326,11 +326,11 @@ inline op nqp_dynop_setup() :base_core {
         /* Set up write barrier functions. */
         /* XXX Really want a better, cheaper place to put them... */
         obj_sc_barrier = Parrot_pmc_new(interp, enum_class_Pointer);
-        VTABLE_set_pointer(interp, obj_sc_barrier, SC_write_barrier_obj);
+        VTABLE_set_pointer(interp, obj_sc_barrier, (void*)SC_write_barrier_obj);
         VTABLE_set_pmc_keyed_str(interp, interp->root_namespace,
             Parrot_str_new_constant(interp, "_OBJ_SC_BARRIER"), obj_sc_barrier);
         st_sc_barrier = Parrot_pmc_new(interp, enum_class_Pointer);
-        VTABLE_set_pointer(interp, st_sc_barrier, SC_write_barrier_st);
+        VTABLE_set_pointer(interp, st_sc_barrier, (void*)SC_write_barrier_st);
         VTABLE_set_pmc_keyed_str(interp, interp->root_namespace,
             Parrot_str_new_constant(interp, "_ST_SC_BARRIER"), st_sc_barrier);
 

src/ops/nqp_dyncall.ops

@@ -409,9 +409,9 @@ unmarshal_string(PARROT_INTERP, PMC *value, INTVAL type, INTVAL *free) {
         else {
             str = Parrot_str_to_encoded_cstring(interp,
                 REPR(value)->box_funcs->get_str(interp, STABLE(value), OBJECT_BODY(value)),
-                type & DYNCALL_ARG_TYPE_MASK == DYNCALL_ARG_ASCIISTR ? Parrot_ascii_encoding_ptr :
-                type & DYNCALL_ARG_TYPE_MASK == DYNCALL_ARG_UTF16STR ? Parrot_utf16_encoding_ptr :
-                                                            Parrot_utf8_encoding_ptr);
+		(type & DYNCALL_ARG_TYPE_MASK) == DYNCALL_ARG_ASCIISTR ? Parrot_ascii_encoding_ptr :
+		(type & DYNCALL_ARG_TYPE_MASK) == DYNCALL_ARG_UTF16STR ? Parrot_utf16_encoding_ptr :
+		                                                         Parrot_utf8_encoding_ptr);
 
             if (free && type & DYNCALL_ARG_FREE_STR_MASK) {
                 *free = 1;
@@ -531,7 +531,7 @@ unmarshal_callback(PARROT_INTERP, PMC *value, PMC *info) {
         data->interp = interp;
         data->sub = value;
 
-        data->cb = dcbNewCallback(signature, &callback_handler, data);
+        data->cb = dcbNewCallback((const char *)signature, (DCCallbackHandler*)&callback_handler, data);
 
         mem_sys_free(signature); /* XXX: Not entirely sure if I can do this... */