diff --git a/IlmBase/Half/half.cpp b/IlmBase/Half/half.cpp index 609aaa1415..09a50aa2fc 100644 --- a/IlmBase/Half/half.cpp +++ b/IlmBase/Half/half.cpp @@ -94,9 +94,9 @@ half::convert (int i) // of float and half (127 versus 15). // - register int s = (i >> 16) & 0x00008000; - register int e = ((i >> 23) & 0x000000ff) - (127 - 15); - register int m = i & 0x007fffff; + int s = (i >> 16) & 0x00008000; + int e = ((i >> 23) & 0x000000ff) - (127 - 15); + int m = i & 0x007fffff; // // Now reassemble s, e and m into a half: diff --git a/IlmBase/Half/half.h b/IlmBase/Half/half.h index f78e4f623f..da418d65e1 100644 --- a/IlmBase/Half/half.h +++ b/IlmBase/Half/half.h @@ -459,7 +459,7 @@ half::half (float f) // to do the float-to-half conversion. // - register int e = (x.i >> 23) & 0x000001ff; + int e = (x.i >> 23) & 0x000001ff; e = _eLut[e]; @@ -470,7 +470,7 @@ half::half (float f) // bits and combine it with the sign and exponent. // - register int m = x.i & 0x007fffff; + int m = x.i & 0x007fffff; _h = e + ((m + 0x00000fff + ((m >> 13) & 1)) >> 13); } else diff --git a/IlmBase/Imath/ImathMatrix.h b/IlmBase/Imath/ImathMatrix.h index 3e96c2fda1..1d7f8dc635 100644 --- a/IlmBase/Imath/ImathMatrix.h +++ b/IlmBase/Imath/ImathMatrix.h @@ -2527,11 +2527,11 @@ Matrix44::multiply (const Matrix44 &a, const Matrix44 &b, Matrix44 &c) { - register const T * IMATH_RESTRICT ap = &a.x[0][0]; - register const T * IMATH_RESTRICT bp = &b.x[0][0]; - register T * IMATH_RESTRICT cp = &c.x[0][0]; + const T * IMATH_RESTRICT ap = &a.x[0][0]; + const T * IMATH_RESTRICT bp = &b.x[0][0]; + T * IMATH_RESTRICT cp = &c.x[0][0]; - register T a0, a1, a2, a3; + T a0, a1, a2, a3; a0 = ap[0]; a1 = ap[1];