diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-03-20 00:41:02 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-03-20 00:41:02 +0000 |
| commit | 1215fe2471b6d45d61d5ae4e36b1c16c8bca3e0f (patch) | |
| tree | 8f26f7daf8bbc11fc92467bdb8e0bfa582ab37e2 | |
| parent | 5c677f74d504ee9d8435ce1c14ff16eeb58e1b4b (diff) | |
Use prefix to avoid ERROR enum.
| -rw-r--r-- | src/verify.cc | 4 | ||||
| -rw-r--r-- | src/verify.h | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/verify.cc b/src/verify.cc index 76d7c18d..8f850e83 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -59,9 +59,9 @@ dcp::verify (vector<boost::filesystem::path> directories) try { i->read (true, &errors); } catch (DCPReadError& e) { - notes.push_back (VerificationNote (VerificationNote::ERROR, e.what ())); + notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, e.what ())); } catch (XMLError& e) { - notes.push_back (VerificationNote (VerificationNote::ERROR, e.what ())); + notes.push_back (VerificationNote (VerificationNote::VERIFY_ERROR, e.what ())); } } diff --git a/src/verify.h b/src/verify.h index 63f47e28..3538722e 100644 --- a/src/verify.h +++ b/src/verify.h @@ -44,10 +44,13 @@ namespace dcp { class VerificationNote { public: + /* I've been unable to make mingw happy with ERROR as a symbol, so + I'm using a VERIFY_ prefix here. + */ enum Type { - ERROR, - WARNING, - NOTE + VERIFY_ERROR, + VERIFY_WARNING, + VERIFY_NOTE }; VerificationNote (Type type, std::string note) |