diff options
| author | Alexander Gavrilov | 2012-04-20 13:30:37 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-04-20 13:30:37 +0400 |
| commit | 0a6982f4041f43d571bd2690f148ff369f2d8038 (patch) | |
| tree | 13d60514e341a3bafa36ffa7b8391d1eb5956e38 /library/DataDefs.cpp | |
| parent | d95cc3435fe249e1c86e5af36b8a10e9009edd97 (diff) | |
| download | dfhack-0a6982f4041f43d571bd2690f148ff369f2d8038.tar.gz dfhack-0a6982f4041f43d571bd2690f148ff369f2d8038.tar.bz2 dfhack-0a6982f4041f43d571bd2690f148ff369f2d8038.tar.xz | |
Enable warnings correctly on linux and fix a lot of them.
Diffstat (limited to 'library/DataDefs.cpp')
| -rw-r--r-- | library/DataDefs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp index 06263518..061110ec 100644 --- a/library/DataDefs.cpp +++ b/library/DataDefs.cpp @@ -98,7 +98,7 @@ std::vector<compound_identity*> compound_identity::top_scope; compound_identity::compound_identity(size_t size, TAllocateFn alloc, compound_identity *scope_parent, const char *dfhack_name) - : constructed_identity(size, alloc), scope_parent(scope_parent), dfhack_name(dfhack_name) + : constructed_identity(size, alloc), dfhack_name(dfhack_name), scope_parent(scope_parent) { next = list; list = this; } @@ -146,8 +146,8 @@ enum_identity::enum_identity(size_t size, const char *const *keys, const void *attrs, struct_identity *attr_type) : compound_identity(size, NULL, scope_parent, dfhack_name), - first_item_value(first_item_value), last_item_value(last_item_value), - keys(keys), base_type(base_type), attrs(attrs), attr_type(attr_type) + keys(keys), first_item_value(first_item_value), last_item_value(last_item_value), + base_type(base_type), attrs(attrs), attr_type(attr_type) { } @@ -382,7 +382,7 @@ int DFHack::findEnumItem(const std::string &name, int size, const char *const *i void DFHack::flagarrayToString(std::vector<std::string> *pvec, const void *p, int bytes, int base, int size, const char *const *items) { - for (unsigned i = 0; i < bytes*8; i++) { + for (int i = 0; i < bytes*8; i++) { int value = getBitfieldField(p, i, 1); if (value) |
