[cig-commits] r13579 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:14:56 -0800 (Tue, 09 Dec 2008)
New Revision: 13579

Modified:
   cs/cigma/trunk/src/DataPath.cpp
   cs/cigma/trunk/src/DataPath.h
Log:
Simplified operator<< on DataPath

Modified: cs/cigma/trunk/src/DataPath.cpp
===================================================================
--- cs/cigma/trunk/src/DataPath.cpp	2008-12-10 02:14:55 UTC (rev 13578)
+++ cs/cigma/trunk/src/DataPath.cpp	2008-12-10 02:14:56 UTC (rev 13579)
@@ -105,6 +105,16 @@
     return dname;
 }
 
+std::string DataPath::first() const
+{
+    return fname;
+}
+
+std::string DataPath::second() const
+{
+    return dname;
+}
+
 void DataPath::set_filename(std::string fname)
 {
     this->fname = fname;
@@ -118,9 +128,13 @@
 
 // ----------------------------------------------------------------------------
 
-std::ostream &operator<<(std::ostream &os, const DataPath &dp)
+std::ostream& operator<<(std::ostream& os, const DataPath& dp)
 {
-    os << dp.filename() << ":" << dp.location();
+    os << dp.filename();
+    if (dp.location() != "")
+    {
+        os << ":" << dp.location();
+    }
     return os;
 }
 

Modified: cs/cigma/trunk/src/DataPath.h
===================================================================
--- cs/cigma/trunk/src/DataPath.h	2008-12-10 02:14:55 UTC (rev 13578)
+++ cs/cigma/trunk/src/DataPath.h	2008-12-10 02:14:56 UTC (rev 13579)
@@ -21,6 +21,8 @@
     std::string extension() const;
     std::string filename() const;
     std::string location() const;
+    std::string first() const;
+    std::string second() const;
 
     void set_filename(std::string fname);
     void set_location(std::string dname);
@@ -31,6 +33,6 @@
 };
 
 
-std::ostream &operator<<(std::ostream &os, const DataPath &dp);
+std::ostream& operator<<(std::ostream& os, const DataPath& dp);
 
 #endif