Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 17:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix compilation on OS-X.

Browse source 
OS X complains about std::pair not having a constexpr constructor. Which
seems to be the case for C++11. Hence, let's make it static const for
the moment.

This commit should be reverted when we move to C++17.
This commit is contained in:
Johanna Amann 2019-10-07 18:52:11 -07:00
parent e615d1f4a8
commit cde28074a1
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Val.cc
View file

@ -666,7 +666,7 @@ void IntervalVal::ValDescribe(ODesc* d) const
{ {
using unit_word = std::pair<double, const char*>; using unit_word = std::pair<double, const char*>;
constexpr std::array<unit_word, 6> units = { static const std::array<unit_word, 6> units = {
unit_word{ Days, "day" }, unit_word{ Days, "day" },
unit_word{ Hours, "hr" }, unit_word{ Hours, "hr" },
unit_word{ Minutes, "min" }, unit_word{ Minutes, "min" },