Use size_t for memory buffer sizes

diff --git a/source/builtinsource.cpp b/source/builtinsource.cpp
index 5d19fbe33f809ad0720bea25cf600df61881591a..5645467bbb682075d9dc840fca094a797dfa29b0 100644 (file)
--- a/source/builtinsource.cpp
+++ b/source/builtinsource.cpp
@@ -8,7 +8,7 @@ using namespace std;
 namespace Msp {
 namespace DataFile {
 
 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);
 }
 {
        objects[name] = Object(content, size);
 }


@@ -53,7 +53,7 @@ IO::Seekable *BuiltinSource::open(const string &name) const
 }
 
 
 }
 
 

-BuiltinSource::Object::Object(const char *d, unsigned s):
+BuiltinSource::Object::Object(const char *d, size_t s):

        data(d),
        size(s)
 { }
        data(d),
        size(s)
 { }

diff --git a/source/builtinsource.h b/source/builtinsource.h
index 827850892383c6229c86de13ad068f4c2c6744ac..e81b37f0a7dac49e9f1f6e10af6fd7baad87fca8 100644 (file)
--- a/source/builtinsource.h
+++ b/source/builtinsource.h
@@ -12,16 +12,16 @@ private:
        struct Object
        {
                const char *data = nullptr;
        struct Object
        {
                const char *data = nullptr;

-               unsigned size = 0;
+               std::size_t size = 0;

 
                Object() = default;
 
                Object() = default;

-               Object(const char *, unsigned);
+               Object(const char *, std::size_t);

        };
 
        std::map<std::string, Object> objects;
 
 public:
        };
 
        std::map<std::string, Object> objects;
 
 public:

-       void add_object(const std::string &, const char *, unsigned);
+       void add_object(const std::string &, const char *, std::size_t);

        void add_object(const std::string &, const char *);
 
        bool is_loadable(const CollectionItemTypeBase &, const std::string &) const override;
        void add_object(const std::string &, const char *);
 
        bool is_loadable(const CollectionItemTypeBase &, const std::string &) const override;

diff --git a/source/output.cpp b/source/output.cpp
index f4673378b69e95a7ff55baabf001606e3726a3dc..46d270ad7263ae5d88e656918bfe02b7528e09e8 100644 (file)
--- a/source/output.cpp
+++ b/source/output.cpp
@@ -21,12 +21,12 @@ void Output::set_compressed()
        out = compressed;
 }
 
        out = compressed;
 }
 

-unsigned Output::put(char c)
+size_t Output::put(char c)

 {
        return out->put(c);
 }
 
 {
        return out->put(c);
 }
 

-unsigned Output::write(const string &s)
+size_t Output::write(const string &s)

 {
        return out->write(s);
 }
 {
        return out->write(s);
 }

diff --git a/source/output.h b/source/output.h
index 931c01fba091e8f36ac74d8385ee595c1b9aed29..4a4bc81f00377b2006aa7b15faf2452d8774e809 100644 (file)
--- a/source/output.h
+++ b/source/output.h
@@ -19,8 +19,8 @@ public:
 
        void set_compressed();
 
 
        void set_compressed();
 

-       unsigned put(char);
-       unsigned write(const std::string &);
+       std::size_t put(char);
+       std::size_t write(const std::string &);

 };
 
 } // namespace DataFile
 };
 
 } // namespace DataFile

diff --git a/source/statement.h b/source/statement.h
index f20bf119d0fa07e1886e88e7e1b45b6b3841ac85..a580f379e47eb5130aa6379aa03d301433ce614b 100644 (file)
--- a/source/statement.h
+++ b/source/statement.h
@@ -55,8 +55,8 @@ struct StatementKey
 struct StatementInfo
 {
        StatementKey key;
 struct StatementInfo
 {
        StatementKey key;

-       unsigned args_size = 0;
-       std::vector<unsigned> arg_offsets;
+       std::size_t args_size = 0;
+       std::vector<std::size_t> arg_offsets;

 
        StatementInfo() = default;
        StatementInfo(const std::string &, const std::string &);
 
        StatementInfo() = default;
        StatementInfo(const std::string &, const std::string &);