Changeset 10410

Timestamp:

06/25/09 15:26:26 (4 years ago)

Author:

robert

Message:

From Mathias Froehlich, "Fix possible problem with aliasing rules.. and fix a gcc warning :)Use a union to determine if we are on a little endian or big endian machine."

Files:

• OpenSceneGraph/trunk/include/osg/Endian (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/Endian

@@ -27 +27 @@
 inline Endian getCpuByteOrder()
 {
-    static char big_endian_1[2] = { 0, 1 };
+    union {
+        char big_endian_1[2];
+        short is_it_really_1;
+    } u;
+    u.big_endian_1[0] = 0;
+    u.big_endian_1[1] = 1;
 
-    if ( (*((short*) big_endian_1)) == 1)
+    if (u.is_it_really_1 == 1)
         return BigEndian;
     else