Changeset 635774 in git

Timestamp:

Dec 1, 2011, 12:47:44 AM (11 years ago)

Author:

Jan Engelhardt <jengelh@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

5fb90e187708870eec87d901ccccd6786f4fa347

Parents:

0943bdd5f1e662166add7c3fed483d8971bd4108

git-author:

Jan Engelhardt <jengelh@medozas.de>2011-12-01 00:47:44+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-13 20:03:46+01:00

Message:

factory/src: silence compile warnings -Wint-to-pointer-cast

Ideally, one should use uintptr_t (from <stdint.h>/<cstdint>), but I
guess some lame compilers may still not have this yet.

imm.h: In function "InternalCF* int2imm(int)":
imm.h:59:45: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
imm.h: In function "InternalCF* int2imm_p(int)":
imm.h:85:44: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]
imm.h: In function "InternalCF* int2imm_gf(int)":
imm.h:90:44: warning: cast to pointer from integer
of different size [-Wint-to-pointer-cast]

Location:

factory

Files:

• configure.ac (modified) (1 diff)
• imm.h (modified) (3 diffs)

factory/configure.ac

@@ -13 +13 @@
 # - initialisation.
 #
-AC_INIT([factory], [3.1.2.sw])
+AC_INIT([factory], [3.1.3])
 AC_CONFIG_SRCDIR(canonicalform.cc)
 AC_CONFIG_MACRO_DIR([../m4])

factory/imm.h

@@ -57 +57 @@
 inline InternalCF * int2imm ( int i )
 {
-    return (InternalCF*)((i << 2) | INTMARK );
+    return (InternalCF*)(long)((i << 2) | INTMARK );
 }
 
@@ -74 +74 @@
 {
     if ( i < 0 )
-        return (InternalCF*)(-(((-i) << 2) | INTMARK));
-    else
-        return (InternalCF*)((i << 2) | INTMARK );
+        return (InternalCF*)(long)(-(((-i) << 2) | INTMARK));
+    else
+        return (InternalCF*)(long)((i << 2) | INTMARK );
 }
 
@@ -83 +83 @@
 inline InternalCF * int2imm_p ( int i )
 {
-    return (InternalCF*)((i << 2) | FFMARK );
+    return (InternalCF*)(long)((i << 2) | FFMARK );
 }
 
 inline InternalCF * int2imm_gf ( int i )
 {
-    return (InternalCF*)((i << 2) | GFMARK );
+    return (InternalCF*)(long)((i << 2) | GFMARK );
 }
 //}}}