Changeset 20011 for trunk

Timestamp:

12/21/20 16:05:29 (4 years ago)

Author:

tbretz

Message:

Had to change to pointers, emplace_back and ofstream do not work in gcc 4.8(\!) ... ARGH\! CentOS 7 technology from the 80s

Location:

trunk/FACT++/src

Files:

• root2csv.cc (modified) (5 diffs)
• rootifysql.cc (modified) (4 diffs)

trunk/FACT++/src/root2csv.cc

@@ -679 +679 @@
         cout << "\n-------------------------- Converting file -------------------------" << endl;
 
-    vector<ofstream> outfiles;
+    vector<unique_ptr<ofstream>> outfiles;
 
     if (split.empty())
@@ -688 +688 @@
             return rc;
 
-        outfiles.emplace_back(path.Data(), append ? ios::app : ios::trunc);
+        outfiles.emplace_back(new ofstream(path.Data(), append ? ios::app : ios::trunc));
         if (rc==-1 || (force && rc==0 && !append))
-            WriteHeader(outfiles.back(), vec, formulas, skip, header);
+            WriteHeader(*outfiles.back(), vec, formulas, skip, header);
     }
     else
@@ -703 +703 @@
             if (rc>0)
                 return rc;
-            outfiles.emplace_back(path.Data(), append ? ios::app : ios::trunc);
+            outfiles.emplace_back(new ofstream(path.Data(), append ? ios::app : ios::trunc));
             if (rc==-1 || (force && rc==0 && !append))
-                WriteHeader(outfiles.back(), vec, formulas, skip, header);
+                WriteHeader(*outfiles.back(), vec, formulas, skip, header);
         }
     }
@@ -749 +749 @@
             join.emplace_back(to_string((*v)->EvalInstance(0)));
 
-        outfiles[index] << boost::join(join, " ") << "\n";
+        *outfiles[index] << boost::join(join, " ") << "\n";
     }
 
@@ -755 +755 @@
     {
         cout << "\nTotal: N=" << count << " out of " << num << " row(s) written [N=" << first << ".." << num-1 << "]." << endl;
-        for (int i=0; i<split.size(); i++)
+        for (size_t i=0; i<split.size(); i++)
             cout << "File " << i << ": nrows=" << ncount[i] << '\n';
         cout << '\n';

trunk/FACT++/src/rootifysql.cc

@@ -937 +937 @@
     // ------------------------- Open the ascii files --------------------------
 
-    vector<ofstream> fout;
+    vector<unique_ptr<ofstream>> fout;
     if (!write.empty())
     {
@@ -949 +949 @@
         for (auto it=names.cbegin(); it!=names.cend(); it++)
         {
-            fout.emplace_back(*it);
+            fout.emplace_back(new ofstream(*it));
             if (!*fout.rbegin())
                 cout << "WARNING: Writing to '" << write << "' failed: " << strerror(errno) << endl;
@@ -997 +997 @@
     for (auto ff=fout.begin(); ff!=fout.end(); ff++)
     {
-        *ff << contents;
-        *ff << "# " << htxt.str() << endl;
+        **ff << contents;
+        **ff << "# " << htxt.str() << endl;
     }
 
@@ -1016 +1016 @@
             cout << rtxt.str() << '\n';
         if (!fout.empty())
-            fout[index] << rtxt.str() << '\n';
+            *fout[index] << rtxt.str() << '\n';
 
         size_t idx=0;