diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-06-17 16:20:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 16:20:50 +0200 |
| commit | 0b83619818e243a5d280e6fb7b3a5c39af2cd03a (patch) | |
| tree | 6a87cea0dcc8a1e58930683b5ebaac9291909b38 | |
| parent | 7731f962a5064c6ba29ba52dbfe8edf743b58a32 (diff) | |
| parent | 9badf0911cd8287de36fa3d58326bc2cbb93708b (diff) | |
Merge pull request #70 from yahoo/balder/gcc-5.4
Add missing includes for gcc 5.4
| -rw-r--r-- | searchlib/src/vespa/searchlib/expression/resultnodes.cpp | 1 | ||||
| -rw-r--r-- | vespamalloc/src/vespamalloc/util/osmem.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/searchlib/src/vespa/searchlib/expression/resultnodes.cpp b/searchlib/src/vespa/searchlib/expression/resultnodes.cpp index 9a1d3639a8e..2694385a557 100644 --- a/searchlib/src/vespa/searchlib/expression/resultnodes.cpp +++ b/searchlib/src/vespa/searchlib/expression/resultnodes.cpp @@ -7,6 +7,7 @@ #include <vespa/searchlib/expression/enumresultnode.h> #include <vespa/searchlib/expression/nullresultnode.h> #include <vespa/searchlib/expression/positiveinfinityresultnode.h> +#include <math.h> #include <vespa/log/log.h> LOG_SETUP(".searchlib.documentexpressions"); diff --git a/vespamalloc/src/vespamalloc/util/osmem.cpp b/vespamalloc/src/vespamalloc/util/osmem.cpp index c5f44342c75..0b02900b678 100644 --- a/vespamalloc/src/vespamalloc/util/osmem.cpp +++ b/vespamalloc/src/vespamalloc/util/osmem.cpp @@ -6,6 +6,7 @@ #include <sys/mman.h> #include <linux/mman.h> #include <algorithm> +#include <errno.h> namespace vespamalloc { |