Moving CSVReader and CSVWriter implementation to master branch. Resolved conflicts for merge with master branch. Now the CSVReader and CSVWriter could be used with std::tuples.
Description
Description
Details
Details
- Auditors
• juhasz - Provenance
• ewillegger Authored on Jun 27 2019, 12:53 PM • ewillegger Pushed on Jun 27 2019, 12:54 PM - Parents
- R20:e4f912949f50: Merge branch 'master' into deluxe-tuplevalues
R20:a6ee3f99d87a: Extend documentation on rosa::csv::CSVTupleWriter::writeHeader() - Branches
- Unknown
- Tags
Event Timeline
| /include/rosa/deluxe/DeluxeContext.hpp | ||
|---|---|---|
| 884 | This conflict remained in the file... | |
| /include/rosa/deluxe/DeluxeContext.hpp | ||
|---|---|---|
| 884 | Fixed in R20:8d0031037a9c. | |
Comment Actions
MSVC gives the following error output:
9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(275): error C2220: warning treated as error - no 'object' file generated 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(275): warning C4458: declaration of 'Delimeter' hides class member 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(295): note: see declaration of 'rosa::csv::`anonymous-namespace'::CSVRow<float>::Delimeter' 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(275): note: while compiling class template member function 'void rosa::csv::`anonymous-namespace'::CSVRow<float>::SetDelimeter(char)' 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(384): note: see reference to function template instantiation 'void rosa::csv::`anonymous-namespace'::CSVRow<float>::SetDelimeter(char)' being compiled 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(479): note: see reference to class template instantiation 'rosa::csv::`anonymous-namespace'::CSVRow<float>' being compiled 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\apps\sa-ews1\sa-ews1.cpp(309): note: see reference to class template instantiation 'rosa::csv::CSVIterator<float>' being compiled 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(266): warning C4458: declaration of 'HeaderInfo' hides class member 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(294): note: see declaration of 'rosa::csv::`anonymous-namespace'::CSVRow<float>::HeaderInfo' 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(266): note: while compiling class template member function 'void rosa::csv::`anonymous-namespace'::CSVRow<float>::SetHeaderInfo(const rosa::csv::HeaderInformation) noexcept' 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(383): note: see reference to function template instantiation 'void rosa::csv::`anonymous-namespace'::CSVRow<float>::SetHeaderInfo(const rosa::csv::HeaderInformation) noexcept' being compiled 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(256): warning C4458: declaration of 'SkipRows' hides class member 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(290): note: see declaration of 'rosa::csv::`anonymous-namespace'::CSVRow<float>::SkipRows' 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(256): note: while compiling class template member function 'void rosa::csv::`anonymous-namespace'::CSVRow<float>::SetSkipRows(const size_t) noexcept' 9>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\include\rosa/support/csv/CSVReader.hpp(382): note: see reference to function template instantiation 'void rosa::csv::`anonymous-namespace'::CSVRow<float>::SetSkipRows(const size_t) noexcept' being compiled
Please fix the warnings in CSVReader.hpp. Hiding member fields will cause confusion and some problem sooner or later...
Further:
7>C:\Users\juhasz\Documents\GitHub\SoC_Rosa_repo\examples\CSVFiles\main.cpp(31): fatal error C1083: Cannot open include file: 'unistd.h': No such file or directory
Windows does not have unistd.h. What do you use it for?
Comment Actions
I changed the names of the local variables in commit 77afb5d8c6d2.
I also tried to solve your raised concern, but you already fixed it by commit 8d0031037a9c, or am I wrong?
I don't have any MSVC installed could you please check, if it is now compiling as expected.
If all issues are addressed could you close your concerns?
Comment Actions
Sorry for my late reply; I was on vacation last week.
Thanks for the fixes.
I compiled and found some more small details that made MSVC give warnings. I fixed them in R20:142e41266374.
I also tried to solve your raised concern, but you already fixed it by commit 8d0031037a9c, or am I wrong?
Correct. That conflict was in my part, so I thought I should take care of it ;)
If all issues are addressed could you close your concerns?
Done.
Merged Changes
Merged Changes