Use default member initializers for constant initial values

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

diff --git a/source/objectloader.h b/source/objectloader.h
index 76fc412abed60db13c7b7e4b80837ffad0ca93df..4c5dd020b722943fdd78fdcca067a67a565f12f5 100644 (file)
--- a/source/objectloader.h
+++ b/source/objectloader.h
@@ -1,18 +1,12 @@
 #ifndef MSP_DATAFILE_OBJECTLOADER_H_
 #define MSP_DATAFILE_OBJECTLOADER_H_
 
-#include <typeinfo>
+#include "except.h"
 #include "loader.h"
 
 namespace Msp {
 namespace DataFile {
 
-class no_collection: public std::runtime_error
-{
-public:
-       no_collection(const std::type_info &);
-};
-
 class Collection;
 
 /**
@@ -69,7 +63,7 @@ public:
        typedef C Collection;
 
 protected:
-       C *coll;
+       C *coll = nullptr;
 
        CollectionObjectLoader(O &o, C *c): ObjectLoader<O>(o), coll(c) { }