mirror of
https://github.com/ParksProjets/Maconv.git
synced 2024-06-26 22:29:40 +00:00
Fix class variable definition order to silence compiler warnings with -Wall (-Wreorder)
This commit is contained in:
parent
596c97bc8d
commit
c4dec1cd15
|
@ -33,14 +33,14 @@ struct SignToMac {
|
||||||
// Maching type: extension or file command.
|
// Maching type: extension or file command.
|
||||||
enum Type { Extension, FileCmd } type;
|
enum Type { Extension, FileCmd } type;
|
||||||
|
|
||||||
// Help strings (and count)
|
|
||||||
int help_len;
|
|
||||||
const char **helps;
|
|
||||||
|
|
||||||
// MAC creator and type.
|
// MAC creator and type.
|
||||||
const char *creator;
|
const char *creator;
|
||||||
const char *mac;
|
const char *mac;
|
||||||
|
|
||||||
|
// Help strings (and count)
|
||||||
|
int help_len;
|
||||||
|
const char **helps;
|
||||||
|
|
||||||
constexpr SignToMac(Type t, const char *c, const char *m, const char **hs, int hl)
|
constexpr SignToMac(Type t, const char *c, const char *m, const char **hs, int hl)
|
||||||
: type{t}, creator{c}, mac{m}, help_len{hl}, helps{hs} {}
|
: type{t}, creator{c}, mac{m}, help_len{hl}, helps{hs} {}
|
||||||
};
|
};
|
||||||
|
|
|
@ -71,10 +71,10 @@ struct FileReader {
|
||||||
|
|
||||||
uint8_t *data; // Input data.
|
uint8_t *data; // Input data.
|
||||||
uint32_t file_size; // Total size of the file.
|
uint32_t file_size; // Total size of the file.
|
||||||
|
std::string filename; // Name of the file to read.
|
||||||
|
|
||||||
utils::RawDataStreamBuf stream_buf; // Stream buffer from raw data buffer.
|
utils::RawDataStreamBuf stream_buf; // Stream buffer from raw data buffer.
|
||||||
std::istream stream; // Stream for reading data.
|
std::istream stream; // Stream for reading data.
|
||||||
std::string filename; // Name of the file to read.
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user