Commit 42dc29e1 authored by David Thompson's avatar David Thompson Committed by Kitware Robot
Browse files

Merge topic 'fix-gcc48'

c08d0624

 Fix a gcc-4.8 compile error by not doing stupid things.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: John Tourtellott's avatarJohn Tourtellott <john.tourtellott@kitware.com>
Merge-request: !518
parents fc8627ee c08d0624
...@@ -74,7 +74,7 @@ void StoredResource::markModified(bool isDirty) ...@@ -74,7 +74,7 @@ void StoredResource::markModified(bool isDirty)
} }
} }
/// Return the generation number of the resource (times /// Return the generation number of the resource
int StoredResource::generation() const int StoredResource::generation() const
{ {
return this->m_generation; return this->m_generation;
...@@ -88,7 +88,7 @@ bool StoredResource::exists(const std::string& prefix) const ...@@ -88,7 +88,7 @@ bool StoredResource::exists(const std::string& prefix) const
{ {
if (!this->m_url.empty()) if (!this->m_url.empty())
{ {
std::ifstream tryToOpen = std::ifstream(this->m_url); std::ifstream tryToOpen(this->m_url);
if (tryToOpen.good()) if (tryToOpen.good())
{ {
return true; return true;
...@@ -96,8 +96,8 @@ bool StoredResource::exists(const std::string& prefix) const ...@@ -96,8 +96,8 @@ bool StoredResource::exists(const std::string& prefix) const
if (!prefix.empty()) if (!prefix.empty())
{ {
tryToOpen = std::ifstream(prefix + this->m_url); std::ifstream tryToOpen2(prefix + this->m_url);
if (tryToOpen.good()) if (tryToOpen2.good())
{ {
return true; return true;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment