diff options
| author | Sergey Yershov <yershov@corp.mail.ru> | 2015-02-13 21:22:46 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:38:06 +0300 |
| commit | 3363aba81c28935c23de60f5874ce11c77796868 (patch) | |
| tree | 8dd3d91462369ce1b68a3505b27dfa47b533a2af /coding | |
| parent | 351a5deb337c6d680e4d8ae62e0a510d7ae7cbdb (diff) | |
Added generator_tool option for set osm data type [xml or o5m]
Diffstat (limited to 'coding')
| -rw-r--r-- | coding/compressed_bit_vector.cpp | 1 | ||||
| -rw-r--r-- | coding/streams_sink.hpp | 4 | ||||
| -rw-r--r-- | coding/write_to_sink.hpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/coding/compressed_bit_vector.cpp b/coding/compressed_bit_vector.cpp index 6573f573ed..beb9304c30 100644 --- a/coding/compressed_bit_vector.cpp +++ b/coding/compressed_bit_vector.cpp @@ -8,6 +8,7 @@ #include "../base/assert.hpp" #include "../base/bits.hpp" +#include "../std/cmath.hpp" namespace { vector<uint32_t> SerialFreqsToDistrTable(Reader & reader, uint64_t & decodeOffset, uint64_t cnt) diff --git a/coding/streams_sink.hpp b/coding/streams_sink.hpp index b80669560d..bc3bd13cd7 100644 --- a/coding/streams_sink.hpp +++ b/coding/streams_sink.hpp @@ -17,7 +17,7 @@ namespace stream SinkReaderStream(TReader & reader) : m_reader(reader) {} template <typename T> - typename enable_if<is_integral<T>, SinkReaderStream &>::type + typename enable_if<is_integral<T>::value, SinkReaderStream &>::type operator >> (T & t) { t = ReadPrimitiveFromSource<T>(m_reader); @@ -53,7 +53,7 @@ namespace stream SinkWriterStream(TWriter & writer) : m_writer(writer) {} template <typename T> - typename enable_if<is_integral<T>, SinkWriterStream &>::type + typename enable_if<is_integral<T>::value, SinkWriterStream &>::type operator << (T const & t) { WriteToSink(m_writer, t); diff --git a/coding/write_to_sink.hpp b/coding/write_to_sink.hpp index 163a54cad8..318c38e21e 100644 --- a/coding/write_to_sink.hpp +++ b/coding/write_to_sink.hpp @@ -6,7 +6,7 @@ template <class TSink, typename T> -typename enable_if<is_integral<T>, void>::type WriteToSink(TSink & sink, T const & v) +typename enable_if<is_integral<T>::value, void>::type WriteToSink(TSink & sink, T const & v) { T const t = SwapIfBigEndian(v); sink.Write(&t, sizeof(T)); |