Skip to content
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

Jump to bottom

[FIX] fixed missing std:: for vector #1

Merged
merged 1 commit into from
Feb 13, 2014
Merged

[FIX] fixed missing std:: for vector #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions src/openms/include/OpenMS/FORMAT/MascotGenericFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace OpenMS
is.seekg(0, std::ios::beg);

UInt spectrum_number(0);
Size line_number(0); // carry line number for error messages within getNextSpectrum()
Size line_number(0); // carry line number for error messages within getNextSpectrum()

typename MapType::SpectrumType spectrum;
spectrum.setMSLevel(2);
Expand Down Expand Up @@ -172,9 +172,9 @@ namespace OpenMS

if (line.empty()) continue;

if (isdigit(line[0]))
{ // actual data .. this comes first, since its the most common case
vector<String> split;
if (isdigit(line[0])) // actual data .. this comes first, since its the most common case
{
std::vector<String> split;
do
{
if (line.empty())
Expand All @@ -186,7 +186,7 @@ namespace OpenMS
line.split(' ', split);
if (split.size() >= 2)
{
p.setPosition(split[0].toDouble());
p.setPosition(split[0].toDouble());
p.setIntensity(split[1].toDouble());
spectrum.push_back(p);
}
Expand All @@ -206,11 +206,11 @@ namespace OpenMS
throw Exception::ParseError(__FILE__, __LINE__, __PRETTY_FUNCTION__, "Reached end of file. Found \"BEGIN IONS\" but not the corresponding \"END IONS\"!", "");
}
}
else if (line.hasPrefix("PEPMASS"))
{ // parse precursor position
else if (line.hasPrefix("PEPMASS")) // parse precursor position
{
String tmp = line.substr(8);
tmp.substitute('\t', ' ');
vector<String> split;
std::vector<String> split;
tmp.split(' ', split);
if (split.size() == 1)
{
Expand Down Expand Up @@ -244,15 +244,15 @@ namespace OpenMS
{
try
{
vector<String> split;
std::vector<String> split;
line.split(',', split);
if (!split.empty())
{
for (Size i = 0; i != split.size(); ++i)
{
if (split[i].hasSubstring("min"))
{
vector<String> split2;
std::vector<String> split2;
split[i].trim().split(' ', split2);
if (!split2.empty())
{
Expand All @@ -265,7 +265,7 @@ namespace OpenMS
catch (Exception::BaseException& /*e*/)
{
// just do nothing and write the whole title to spec
vector<String> split;
std::vector<String> split;
line.split('=', split);
if (split.size() >= 2)
{
Expand All @@ -275,7 +275,7 @@ namespace OpenMS
}
else // just write the title as metainfo to the spectrum
{
vector<String> split;
std::vector<String> split;
line.split('=', split);
if (split.size() == 2)
{
Expand All @@ -289,7 +289,8 @@ namespace OpenMS
}

return false; // found end of file
};
}

};

} // namespace OpenMS
Expand Down