Skip to content

Fix issue ROOT-7588. #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zzxuanyuan wants to merge 3 commits into from
Closed

Fix issue ROOT-7588. #84

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47007ce
Fix issue ROOT-7588. cin is not seekable. Temporary stringstream is c…
zzxuanyuan Sep 4, 2015
3a1d41a
Merge remote-tracking branch 'upstream/master' into wip-ROOT-7588
zzxuanyuan Dec 20, 2015
5d75d99
Verify inputStream is good and then see if is std::cin by calling tel…
zzxuanyuan Jan 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions tree/tree/src/TTree.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ End_Macro

#include <chrono>
#include <cstddef>
#include <iostream>
#include <fstream>
#include <sstream>
#include <string>
Expand Down Expand Up @@ -6989,8 +6990,23 @@ char TTree::GetNewlineValue(std::istream &inputStream)

Long64_t TTree::ReadStream(std::istream& inputStream, const char *branchDescriptor, char delimiter)
{
char newline = GetNewlineValue(inputStream);
std::istream& in = inputStream;
char newline = 0;
std::stringstream ss;
std::istream *inTemp;
Long_t inPos = inputStream.tellg();
if (!inputStream.good()) {
Error("ReadStream","Error reading stream");
return 0;
}
if(inPos == -1){
ss << std::cin.rdbuf();
newline = GetNewlineValue(ss);
inTemp = &ss;
} else {
newline = GetNewlineValue(inputStream);
inTemp = &inputStream;
}
std::istream& in = *inTemp;
Long64_t nlines = 0;

TBranch *branch = 0;
Expand Down