Use InstrSlots::NUM rather than pre-dividing by four. Also, mark this const.

[oota-llvm.git] / include / llvm / System / TimeValue.h

diff --git a/include/llvm/System/TimeValue.h b/include/llvm/System/TimeValue.h
index 07cb18c134398ad7eabe04011352120d63bae3e0..b9ada00712326403d466e9b5e18bc258a44c4665 100644 (file)
--- a/include/llvm/System/TimeValue.h
+++ b/include/llvm/System/TimeValue.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/DataTypes.h"
-#include "llvm/System/IncludeFile.h"
 #include <string>
 
 #ifndef LLVM_SYSTEM_TIMEVALUE_H
@@ -303,14 +302,14 @@ namespace sys {
     void microseconds ( int32_t micros ) {
       this->nanos_ = micros * NANOSECONDS_PER_MICROSECOND;
       this->normalize();
-    };
+    }
 
     /// The seconds component remains unchanged.
     /// @brief Set the nanoseconds component using a number of milliseconds.
     void milliseconds ( int32_t millis ) {
       this->nanos_ = millis * NANOSECONDS_PER_MILLISECOND;
       this->normalize();
-    };
+    }
 
     /// @brief Converts from microsecond format to TimeValue format
     void usec( int64_t microseconds ) {
@@ -354,14 +353,13 @@ namespace sys {
     /// @brief Normalize to canonical form.
     void normalize();
 
-/// @}
+  /// @}
   /// @name Data
   /// @{
   private:
-      /// Store the values as a <timeval>.
-      SecondsType      seconds_;///< Stores the seconds part of the TimeVal
-      NanoSecondsType  nanos_;  ///< Stores the nanoseconds part of the TimeVal
-
+    /// Store the values as a <timeval>.
+    SecondsType      seconds_;///< Stores the seconds part of the TimeVal
+    NanoSecondsType  nanos_;  ///< Stores the nanoseconds part of the TimeVal
   /// @}
 
   };
@@ -381,6 +379,4 @@ inline TimeValue operator - (const TimeValue &tv1, const TimeValue &tv2) {
 }
 }
 
-FORCE_DEFINING_FILE_TO_BE_LINKED(SystemTimeValue)
-
 #endif