Use libmspio instead of C++ iostreams

[libs/datafile.git] / source / loader.h

diff --git a/source/loader.h b/source/loader.h
index 749c1047cd1a762084adb91d37956671fe8d6745..a7d2dbdfbc9eb70f191e9e9c979f355a55174315 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -8,8 +8,9 @@ Distributed under the LGPL
 #ifndef MSP_DATAFILE_LOADER_H_
 #define MSP_DATAFILE_LOADER_H_
 
-#include <fstream>
 #include <map>
+#include <msp/io/buffered.h>
+#include <msp/io/file.h>
 #include "except.h"
 #include "parser.h"
 #include "statement.h"
@@ -361,11 +362,10 @@ Loads an object from a file.  The object must have a public Loader class.
 template<typename T>
 void load(T &obj, const std::string &fn)
 {
-       std::ifstream in(fn.c_str());
-       if(!in)
-               throw Exception("Couldn't open "+fn);
+       IO::File in(fn);
+       IO::Buffered buf(in);
 
-       Parser parser(in, fn);
+       Parser parser(buf, fn);
        typename T::Loader loader(obj);
        loader.load(parser);
 }
@@ -373,9 +373,8 @@ void load(T &obj, const std::string &fn)
 template<typename T, typename U>
 void load(T &obj, const std::string &fn, U arg)
 {
-       std::ifstream in(fn.c_str());
-       if(!in)
-               throw Exception("Couldn't open "+fn);
+       IO::File in(fn);
+       IO::Buffered buf(in);
 
        Parser parser(in, fn);
        typename T::Loader loader(obj, arg);