summaryrefslogtreecommitdiff
path: root/src/core/ResourceLocator.hpp
diff options
context:
space:
mode:
authorBenjamin Paassen <bpaassen@techfak.uni-bielefeld.de>2014-12-09 20:38:09 +0100
committerBenjamin Paassen <bpaassen@techfak.uni-bielefeld.de>2014-12-09 20:38:09 +0100
commit9a131feeb507988b9bde7ff1baccf4e13fe903c4 (patch)
treebcaeb941698171420b719be6f0db595a1c06bbd2 /src/core/ResourceLocator.hpp
parent3ca274c015bc99aaa40f6337d493ea172309f294 (diff)
another try to get the stream method to work. Still compiler errors.
Diffstat (limited to 'src/core/ResourceLocator.hpp')
-rw-r--r--src/core/ResourceLocator.hpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/ResourceLocator.hpp b/src/core/ResourceLocator.hpp
index 5ca3ef3..2706aea 100644
--- a/src/core/ResourceLocator.hpp
+++ b/src/core/ResourceLocator.hpp
@@ -74,9 +74,9 @@ public:
* @param stream is an inputstream that gets the data of the Resource at
* this location.
*/
- void stream(std::istream &input) const
+ std::istream stream() const
{
- return locator.stream(location, input);
+ return std::move(locator.stream(location));
}
};
@@ -105,8 +105,7 @@ public:
* @param stream is an inputstream that gets the data of the Resource at
* this location.
*/
- virtual void stream(const std::string &location,
- std::istream &input) const;
+ virtual std::istream stream(const std::string &location) const;
};
}