Changeset 111 for trunk/lib

Timestamp:

Jun 28, 2006, 5:18:42 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Reverted Gnuplot plot to return nothing (void). fputs have different return values on linux and BSD.

Location:

trunk/lib

Files:

• Gnuplot.cc (modified) (1 diff)
• Gnuplot.h (modified) (5 diffs)

trunk/lib/Gnuplot.cc

@@ -77 +77 @@
 
   
-  int Gnuplot::command(const std::string& cmdstr)
+  void Gnuplot::command(const std::string& cmdstr)
   {
-    int r = fputs(cmdstr.c_str(),pipe_);
-    if (!r && *(cmdstr.rbegin())!='\n')
-      r=fputc('\n',pipe_);
-    return (r ? r : fflush(pipe_));
+    fputs(cmdstr.c_str(),pipe_);
+    if (*(cmdstr.rbegin())!='\n')
+      fputc('\n',pipe_);
+    fflush(pipe_);
   }
 

trunk/lib/Gnuplot.h

@@ -74 +74 @@
     /// @return 0 if fputs, fputc, and fflush are succesful
     ///
-    int command(const std::string&);
+    void command(const std::string&);
 
     ///
@@ -100 +100 @@
     ///
     template <class T1, class T2>
-    int plot(const std::vector<T1>& y, const std::vector<T2>& x)
-    { return plot(y,x,"plot"); }
+    void plot(const std::vector<T1>& y, const std::vector<T2>& x)
+    { plot(y,x,"plot"); }
 
     template <class T1>
-    int plot(const std::vector<T1>& y,
+    void plot(const std::vector<T1>& y,
               const std::vector<T1>& x=std::vector<T1>())
-    { return plot(y,x,"plot"); }
+    { plot(y,x,"plot"); }
 
     ///
@@ -116 +116 @@
     ///
     template <class T1, class T2>
-    int replot(const std::vector<T1>& y, const std::vector<T2>& x)
-    { return plot(y,x,"replot"); }
+    void replot(const std::vector<T1>& y, const std::vector<T2>& x)
+    { plot(y,x,"replot"); }
 
     template <class T1>
-    int replot(const std::vector<T1>& y,
+    void replot(const std::vector<T1>& y,
               const std::vector<T1>& x=std::vector<T1>())
-    { return plot(y,x,"replot"); }
+    { plot(y,x,"replot"); }
 
   private:
@@ -136 +136 @@
     ///
     template <class T1, class T2>
-    int plot(const std::vector<T1>& y, const std::vector<T2>& x,
+    void plot(const std::vector<T1>& y, const std::vector<T2>& x,
               const std::string& plotcmd)
     {
@@ -154 +154 @@
       cmdstring << "e\n";
 
-      return command(cmdstring.str());
+      command(cmdstring.str());
     }