diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-21 22:34:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-21 22:34:49 +0100 |
| commit | 2935d9d158cf35496a35107f9c4ab7d2929cf6c3 (patch) | |
| tree | ded31322feaf0279962127ab45e072b4bc3c1f72 /src/lib/config.cc | |
| parent | fc888176a978d11e9d5487d3afce33cdf92e1342 (diff) | |
Try to fix clashes caused by ERROR, WARNING etc. as variables.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 6d029dd1f..b97ad559d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -73,7 +73,7 @@ Config::Config () , _check_for_updates (false) , _check_for_test_updates (false) , _maximum_j2k_bandwidth (250000000) - , _log_types (Log::GENERAL | Log::WARNING | Log::ERROR) + , _log_types (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR) { _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); @@ -191,7 +191,7 @@ Config::read () _maximum_j2k_bandwidth = f.optional_number_child<int> ("MaximumJ2KBandwidth").get_value_or (250000000); _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate"); - _log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::GENERAL | Log::WARNING | Log::ERROR); + _log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); } void |