Use size_t instead of long to represent memory usage. long is 32 bits

[oota-llvm.git] / include / llvm / Support / MathExtras.h

diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h
index 74958fbc3570bc61d79c2678a043ba54d2e8fc1c..bfc175f2c1ff529cfefd280de9cd150b918cded2 100644 (file)
--- a/include/llvm/Support/MathExtras.h
+++ b/include/llvm/Support/MathExtras.h
@@ -1,4 +1,4 @@
-//===-- Support/MathExtras.h - Useful math functions ------------*- C++ -*-===//
+//===-- llvm/Support/MathExtras.h - Useful math functions -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,13 +11,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_MATHEXTRAS_H
-#define SUPPORT_MATHEXTRAS_H
+#ifndef LLVM_SUPPORT_MATHEXTRAS_H
+#define LLVM_SUPPORT_MATHEXTRAS_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 
+#if defined(log2)
+# undef log2
+#endif
+
 inline unsigned log2(uint64_t C) {
   unsigned getPow;
   for (getPow = 0; C > 1; ++getPow)
@@ -25,16 +29,31 @@ inline unsigned log2(uint64_t C) {
   return getPow;
 }
 
+inline unsigned log2(unsigned C) {
+  unsigned getPow;
+  for (getPow = 0; C > 1; ++getPow)
+    C >>= 1;
+  return getPow;
+}
+
 inline bool isPowerOf2(int64_t C, unsigned &getPow) {
   if (C < 0) C = -C;
   if (C > 0 && C == (C & ~(C - 1))) {
-    getPow = log2((uint64_t)C);
+    getPow = log2(static_cast<uint64_t>(C));
     return true;
   }
 
   return false;
 }
 
+// Platform-independent wrappers for the C99 isnan() function.
+int IsNAN (float f);
+int IsNAN (double d);
+
+// Platform-independent wrappers for the C99 isinf() function.
+int IsInf (float f);
+int IsInf (double d);
+
 } // End llvm namespace
 
 #endif