Trim trailing whitespace, doxygen comments
authorPeter D. Barnes, Jr. <barnes26@llnl.gov>
Wed, 14 Aug 2013 16:53:41 -0700
changeset 10172 22b4d3a7c333
parent 10171 0b3ce943b7c8
child 10173 5cfdaed4d34e
Trim trailing whitespace, doxygen comments
src/core/model/nstime.h
src/core/model/time.cc
--- a/src/core/model/nstime.h	Wed Aug 14 16:52:06 2013 -0700
+++ b/src/core/model/nstime.h	Wed Aug 14 16:53:41 2013 -0700
@@ -478,11 +478,11 @@
    */
   struct Information
   {
-    bool toMul;
-    bool fromMul;
-    int64_t factor;
-    int64x64_t timeTo;
-    int64x64_t timeFrom;
+    bool toMul;                     //!< Multiply when converting To, otherwise divide  
+    bool fromMul;                   //!< Multiple when converting From, otherwise divide
+    int64_t factor;                 //!< Ratio of this unit / current unit		  
+    int64x64_t timeTo;              //!< Multiplier to convert to this unit		  
+    int64x64_t timeFrom;            //!< Multiplier to convert from this unit		  
   };
   /**
    * Current time unit, and conversion info.
--- a/src/core/model/time.cc	Wed Aug 14 16:52:06 2013 -0700
+++ b/src/core/model/time.cc	Wed Aug 14 16:53:41 2013 -0700
@@ -65,7 +65,7 @@
   return firstTime;
 }
 
-
+  
 Time::Time (const std::string& s)
 {
   NS_LOG_FUNCTION (this << &s);
@@ -103,19 +103,19 @@
         }
       else
         {
-      NS_ABORT_MSG ("Can't Parse Time " << s);
-    }
+          NS_ABORT_MSG ("Can't Parse Time " << s);
+        }
     }
   else
     {
-  // they didn't provide units, assume seconds
-  std::istringstream iss;
-  iss.str (s);
-  double v;
-  iss >> v;
-  *this = Time::FromDouble (v, Time::S);
-}
-
+      // they didn't provide units, assume seconds
+      std::istringstream iss;
+      iss.str (s);
+      double v;
+      iss >> v;
+      *this = Time::FromDouble (v, Time::S);
+    }
+  
   if (g_markingTimes)
     {
       Mark (this);