BasicLoader is now called ObjectLoader

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 821482ae1da813c76cfeb32e64b2747dcac548fa..de61b1bca4d5eb7e7ed5593af108ee34a2709abb 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -57,7 +57,7 @@ Layout::~Layout()
 Driver &Layout::get_driver() const
 {
        if(!driver)
-               throw InvalidState("No driver");
+               throw logic_error("!driver");
        return *driver;
 }
 
@@ -344,7 +344,7 @@ void Layout::block_state_changed(Block &block, Block::State state)
 
 
 Layout::Loader::Loader(Layout &l):
-       DataFile::BasicLoader<Layout>(l),
+       DataFile::ObjectLoader<Layout>(l),
        new_tracks(false)
 {
        add("base",  &Layout::base);