X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuiltinsource.cpp;h=bdccd7741c5a7f250585c6058c47d7ee066c9aad;hb=HEAD;hp=65b2718b80357660e8664ac803e6d855badf382b;hpb=256b44a5009467171af53316141277027bcc0ba4;p=libs%2Fdatafile.git diff --git a/source/builtinsource.cpp b/source/builtinsource.cpp index 65b2718..5645467 100644 --- a/source/builtinsource.cpp +++ b/source/builtinsource.cpp @@ -8,7 +8,7 @@ using namespace std; namespace Msp { namespace DataFile { -void BuiltinSource::add_object(const string &name, const char *content, unsigned size) +void BuiltinSource::add_object(const string &name, const char *content, size_t size) { objects[name] = Object(content, size); } @@ -49,16 +49,11 @@ IO::Seekable *BuiltinSource::open(const string &name) const if(i!=objects.end()) return new IO::Memory(i->second.data, i->second.size); - return 0; + return nullptr; } -BuiltinSource::Object::Object(): - data(0), - size(0) -{ } - -BuiltinSource::Object::Object(const char *d, unsigned s): +BuiltinSource::Object::Object(const char *d, size_t s): data(d), size(s) { }