Remove libpath from mspdatatool build info for correct linking with non-default outdir

Fix a bug where a non-buffered File was passed to Parser

diff --git a/Build b/Build
index 99edb318c4d40f2cc5f793445df36eb32436889f..d7e7238d862f70dcde1718be4dd70256fbbc33ae 100644 (file)
--- a/Build
+++ b/Build
@@ -25,7 +25,6 @@ package "mspdatafile"
                install true;
                build_info
                {
-                       libpath ".";
                        library "mspdatafile";
                };
        };

diff --git a/source/loader.h b/source/loader.h
index 0c8118625918823ee2b5ebf6640bfd171a9d85fb..2a2d1416ece760be799037c022662c57244b9cc9 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -366,7 +366,7 @@ void load(T &obj, const std::string &fn, U &arg)
        IO::File in(fn);
        IO::Buffered buf(in);
 
-       Parser parser(in, fn);
+       Parser parser(buf, fn);
        typename T::Loader loader(obj, arg);
        loader.load(parser);
 }