Diff: ros/time.h

Revision:

5:8cd48977ec68

Parent:

1:ff0ec969dad1

--- a/ros/time.h	Wed Feb 29 23:00:21 2012 +0000
+++ b/ros/time.h	Sat Oct 26 15:38:35 2013 +0000
@@ -1,4 +1,4 @@
-/*
+/* 
  * Software License Agreement (BSD License)
  *
  * Copyright (c) 2011, Willow Garage, Inc.
@@ -38,45 +38,35 @@
 #include <ros/duration.h>
 #include <math.h>
 
-namespace ros {
-void normalizeSecNSec(unsigned long &sec, unsigned long &nsec);
+namespace ros
+{
+  void normalizeSecNSec(unsigned long &sec, unsigned long &nsec);
 
-class Time {
-public:
-    unsigned long sec, nsec;
-
-    Time() : sec(0), nsec(0) {}
-    Time(unsigned long _sec, unsigned long _nsec) : sec(_sec), nsec(_nsec) {
-        normalizeSecNSec(sec, nsec);
-    }
+  class Time
+  {
+    public:
+      unsigned long sec, nsec;
 
-    double toSec() const {
-        return (double)sec + 1e-9*(double)nsec;
-    };
-    void fromSec(double t) {
-        sec = (unsigned long) floor(t);
-        nsec = (unsigned long) round((t-sec) * 1e9);
-    };
-
-    unsigned long toNsec() {
-        return (unsigned long)sec*1000000000ull + (unsigned long)nsec;
-    };
-    Time& fromNSec(long t);
+      Time() : sec(0), nsec(0) {}
+      Time(unsigned long _sec, unsigned long _nsec) : sec(_sec), nsec(_nsec)
+      {
+        normalizeSecNSec(sec, nsec);  
+      } 
+        
+      double toSec() const { return (double)sec + 1e-9*(double)nsec; };
+      void fromSec(double t) { sec = (unsigned long) floor(t); nsec = (unsigned long) rint((t-sec) * 1e9); };
 
-    Time& operator +=(const Duration &rhs);
-    Time& operator -=(const Duration &rhs);
-
-    static Time now();
-    static void setNow( Time & new_now);
+      unsigned long toNsec() { return (unsigned long)sec*1000000000ull + (unsigned long)nsec; };
+      Time& fromNSec(long t);
 
-    int round(double x) {
-        int a;
-        a = floor(x + 0.5);
-        return a;
-    }
+      Time& operator +=(const Duration &rhs);
+      Time& operator -=(const Duration &rhs);
 
-};
+      static Time now();
+      static void setNow( Time & new_now);
+  };
 
 }
 
-#endif
\ No newline at end of file
+#endif
+