diff options
40 files changed, 57 insertions, 70 deletions
diff --git a/base/base.hpp b/base/base.hpp index 08caa162ec..209b8b095e 100644 --- a/base/base.hpp +++ b/base/base.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #if defined(DEBUG) || defined(_DEBUG) || defined(NRELEASE) || defined(QT_DEBUG) #define MY_DEBUG_DEFINED 1 diff --git a/base/bits.hpp b/base/bits.hpp index 8291321ae9..6eff37076a 100644 --- a/base/bits.hpp +++ b/base/bits.hpp @@ -2,7 +2,7 @@ #include "base/assert.hpp" #include "std/type_traits.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" namespace bits diff --git a/base/condition_posix.cpp b/base/condition_posix.cpp index f021362e4d..87d8e3902d 100644 --- a/base/condition_posix.cpp +++ b/base/condition_posix.cpp @@ -5,7 +5,7 @@ #include "base/condition.hpp" #include "base/mutex.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/systime.hpp" #include "std/errno.hpp" diff --git a/base/string_utils.hpp b/base/string_utils.hpp index 49f3587188..14bc054924 100644 --- a/base/string_utils.hpp +++ b/base/string_utils.hpp @@ -3,7 +3,7 @@ #include "base/buffer_vector.hpp" #include "std/string.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/sstream.hpp" #include "std/limits.hpp" diff --git a/base/thread.hpp b/base/thread.hpp index a953a11830..d1fd4b7aac 100644 --- a/base/thread.hpp +++ b/base/thread.hpp @@ -8,7 +8,7 @@ #include "std/noncopyable.hpp" #include "std/shared_ptr.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/thread.hpp" #include "std/unique_ptr.hpp" #include "std/utility.hpp" diff --git a/base/timer.hpp b/base/timer.hpp index cfede8afd2..d6e8678a5f 100644 --- a/base/timer.hpp +++ b/base/timer.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/string.hpp" #include "std/ctime.hpp" #include "std/chrono.hpp" diff --git a/coding/arithmetic_codec.hpp b/coding/arithmetic_codec.hpp index 6092a362c6..6220d1db71 100644 --- a/coding/arithmetic_codec.hpp +++ b/coding/arithmetic_codec.hpp @@ -19,7 +19,7 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/vector.hpp" // Forward declarations. diff --git a/coding/bit_streams.hpp b/coding/bit_streams.hpp index d5e6681d9d..93d585f696 100644 --- a/coding/bit_streams.hpp +++ b/coding/bit_streams.hpp @@ -3,7 +3,7 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" // Forward declarations. class Reader; diff --git a/coding/compressed_bit_vector.hpp b/coding/compressed_bit_vector.hpp index 8d1c3a515f..78b459429a 100644 --- a/coding/compressed_bit_vector.hpp +++ b/coding/compressed_bit_vector.hpp @@ -23,7 +23,7 @@ #include "base/assert.hpp" #include "std/iterator.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/vector.hpp" // Forward declare used Reader/Writer. diff --git a/coding/png_memory_encoder.hpp b/coding/png_memory_encoder.hpp index b26712bda1..835c67d950 100644 --- a/coding/png_memory_encoder.hpp +++ b/coding/png_memory_encoder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/vector.hpp" namespace il diff --git a/coding/reader_streambuf.hpp b/coding/reader_streambuf.hpp index 5e35c0a8e9..6b2ad4db75 100644 --- a/coding/reader_streambuf.hpp +++ b/coding/reader_streambuf.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/iostream.hpp" class Reader; diff --git a/coding/timsort/timsort.hpp b/coding/timsort/timsort.hpp index 1a5ec24a4f..4fdbb24b97 100644 --- a/coding/timsort/timsort.hpp +++ b/coding/timsort/timsort.hpp @@ -1,5 +1,5 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" void timsort(void *aArray, size_t aElementCnt, size_t aWidth, int (*aCmpCb)(const void *, const void *)); diff --git a/coding/varint_misc.hpp b/coding/varint_misc.hpp index bae95d2581..a727adcbf6 100644 --- a/coding/varint_misc.hpp +++ b/coding/varint_misc.hpp @@ -7,7 +7,7 @@ #include "coding/writer.hpp" #include "base/assert.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/vector.hpp" // Encode Varint by appending to vector of bytes. diff --git a/common.pri b/common.pri index 2ae5e54404..4c114df781 100644 --- a/common.pri +++ b/common.pri @@ -228,6 +228,7 @@ HEADERS += \ $$ROOT_DIR/std/complex.hpp \ $$ROOT_DIR/std/condition_variable.hpp \ $$ROOT_DIR/std/cstdarg.hpp \ + $$ROOT_DIR/std/cstdint.hpp \ $$ROOT_DIR/std/cstdio.hpp \ $$ROOT_DIR/std/cstdlib.hpp \ $$ROOT_DIR/std/cstring.hpp \ @@ -258,7 +259,6 @@ HEADERS += \ $$ROOT_DIR/std/shared_ptr.hpp \ $$ROOT_DIR/std/sstream.hpp \ $$ROOT_DIR/std/stack.hpp \ - $$ROOT_DIR/std/stdint.hpp \ $$ROOT_DIR/std/string.hpp \ $$ROOT_DIR/std/systime.hpp \ $$ROOT_DIR/std/target_os.hpp \ diff --git a/drape/attribute_buffer_mutator.hpp b/drape/attribute_buffer_mutator.hpp index 32c2c152fb..d5846c849c 100644 --- a/drape/attribute_buffer_mutator.hpp +++ b/drape/attribute_buffer_mutator.hpp @@ -5,7 +5,7 @@ #include "base/shared_buffer_manager.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/map.hpp" namespace dp diff --git a/drape/buffer_base.hpp b/drape/buffer_base.hpp index 2be7849249..bc7234a1e6 100644 --- a/drape/buffer_base.hpp +++ b/drape/buffer_base.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" namespace dp { diff --git a/drape/color.hpp b/drape/color.hpp index 0f1ada0b1d..16e7c7bac9 100644 --- a/drape/color.hpp +++ b/drape/color.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" namespace dp { diff --git a/drape/glconstants.hpp b/drape/glconstants.hpp index 5abfbb7df1..ec226720e9 100644 --- a/drape/glconstants.hpp +++ b/drape/glconstants.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" typedef uint32_t glConst; diff --git a/drape/shader.hpp b/drape/shader.hpp index 6b0990cd40..278aae1df5 100644 --- a/drape/shader.hpp +++ b/drape/shader.hpp @@ -3,7 +3,7 @@ #include "drape/glfunctions.hpp" #include "std/string.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" namespace dp { diff --git a/drape/texture.hpp b/drape/texture.hpp index 544c7a3497..f780902237 100644 --- a/drape/texture.hpp +++ b/drape/texture.hpp @@ -6,7 +6,7 @@ #include "geometry/rect2d.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/function.hpp" namespace dp diff --git a/drape_frontend/intrusive_vector.hpp b/drape_frontend/intrusive_vector.hpp index 4c93492417..d80aac10b3 100644 --- a/drape_frontend/intrusive_vector.hpp +++ b/drape_frontend/intrusive_vector.hpp @@ -2,7 +2,7 @@ #include "base/assert.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" namespace df { diff --git a/drape_frontend/visual_params.hpp b/drape_frontend/visual_params.hpp index da2eabc279..eb8343c59a 100644 --- a/drape_frontend/visual_params.hpp +++ b/drape_frontend/visual_params.hpp @@ -3,7 +3,7 @@ #include "geometry/rect2d.hpp" #include "geometry/screenbase.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/noncopyable.hpp" diff --git a/generator/osm_id.hpp b/generator/osm_id.hpp index 0174aef911..01b7d9f90d 100644 --- a/generator/osm_id.hpp +++ b/generator/osm_id.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/string.hpp" diff --git a/graphics/color.hpp b/graphics/color.hpp index 0462080bbb..9c0dd81f71 100644 --- a/graphics/color.hpp +++ b/graphics/color.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/string.hpp" #include "std/sstream.hpp" diff --git a/graphics/opengl/utils.hpp b/graphics/opengl/utils.hpp index 4373c64db2..fd10ee2405 100644 --- a/graphics/opengl/utils.hpp +++ b/graphics/opengl/utils.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" namespace graphics { diff --git a/indexer/feature_decl.hpp b/indexer/feature_decl.hpp index 157f8d2963..2c0f93f88c 100644 --- a/indexer/feature_decl.hpp +++ b/indexer/feature_decl.hpp @@ -2,7 +2,7 @@ #include "indexer/mwm_set.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/string.hpp" namespace feature diff --git a/indexer/features_offsets_table.hpp b/indexer/features_offsets_table.hpp index 060fdb3b93..803030b72f 100644 --- a/indexer/features_offsets_table.hpp +++ b/indexer/features_offsets_table.hpp @@ -3,7 +3,7 @@ #include "coding/file_container.hpp" #include "coding/mmap_reader.hpp" #include "defines.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/unique_ptr.hpp" #include "std/vector.hpp" #include "3party/succinct/elias_fano.hpp" diff --git a/indexer/interval_index_iface.hpp b/indexer/interval_index_iface.hpp index 94fea67205..c1722b5fbe 100644 --- a/indexer/interval_index_iface.hpp +++ b/indexer/interval_index_iface.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/function.hpp" diff --git a/indexer/mwm_version.hpp b/indexer/mwm_version.hpp index b2d4ae674e..a041ae9f5b 100644 --- a/indexer/mwm_version.hpp +++ b/indexer/mwm_version.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" class FilesContainerR; class ReaderSrc; diff --git a/platform/chunks_download_strategy.hpp b/platform/chunks_download_strategy.hpp index f97b94e783..213cac5bd1 100644 --- a/platform/chunks_download_strategy.hpp +++ b/platform/chunks_download_strategy.hpp @@ -3,7 +3,7 @@ #include "std/string.hpp" #include "std/vector.hpp" #include "std/utility.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" namespace downloader diff --git a/platform/constants.hpp b/platform/constants.hpp index 51b2e3be40..442fa8fc17 100644 --- a/platform/constants.hpp +++ b/platform/constants.hpp @@ -1,5 +1,5 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" static const uint32_t READER_CHUNK_LOG_SIZE = 10; diff --git a/platform/http_request.hpp b/platform/http_request.hpp index cc37416a81..79decab2f2 100644 --- a/platform/http_request.hpp +++ b/platform/http_request.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/function.hpp" #include "std/string.hpp" #include "std/vector.hpp" diff --git a/platform/http_thread_callback.hpp b/platform/http_thread_callback.hpp index a9b2d5c2c5..fe2bc4ce47 100644 --- a/platform/http_thread_callback.hpp +++ b/platform/http_thread_callback.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" namespace downloader { diff --git a/platform/http_thread_qt.hpp b/platform/http_thread_qt.hpp index fae304e10e..1ea32fca7c 100644 --- a/platform/http_thread_qt.hpp +++ b/platform/http_thread_qt.hpp @@ -1,7 +1,7 @@ #pragma once #include "std/string.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include <QObject> #include <QNetworkReply> diff --git a/render/frame_image.hpp b/render/frame_image.hpp index a7f85d2f69..46c5c06516 100644 --- a/render/frame_image.hpp +++ b/render/frame_image.hpp @@ -1,7 +1,7 @@ #pragma once #include "std/vector.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" struct FrameImage { diff --git a/render/software_renderer.hpp b/render/software_renderer.hpp index 3c5109c687..1c77ade30a 100644 --- a/render/software_renderer.hpp +++ b/render/software_renderer.hpp @@ -22,7 +22,7 @@ #include "3party/agg/agg_renderer_primitives.h" #include "3party/agg/agg_path_storage.h" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/unique_ptr.hpp" diff --git a/routing/vehicle_model.hpp b/routing/vehicle_model.hpp index 1f084dbc44..7467353e2f 100644 --- a/routing/vehicle_model.hpp +++ b/routing/vehicle_model.hpp @@ -2,7 +2,7 @@ #include "base/buffer_vector.hpp" #include "std/initializer_list.hpp" -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/unordered_map.hpp" #include "std/utility.hpp" #include "std/vector.hpp" diff --git a/std/cstdint.hpp b/std/cstdint.hpp new file mode 100644 index 0000000000..8ced63f058 --- /dev/null +++ b/std/cstdint.hpp @@ -0,0 +1,19 @@ +#pragma once + +#ifdef new +#undef new +#endif + +#include <cstdint> +using std::int8_t; +using std::uint8_t; +using std::int16_t; +using std::uint16_t; +using std::int32_t; +using std::uint32_t; +using std::int64_t; +using std::uint64_t; + +#ifdef DEBUG_NEW +#define new DEBUG_NEW +#endif diff --git a/std/stdint.hpp b/std/stdint.hpp deleted file mode 100644 index 16786e8886..0000000000 --- a/std/stdint.hpp +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include "common_defines.hpp" -#include "target_os.hpp" - -#ifdef new -#undef new -#endif - -#if defined(_MSC_VER) && _MSC_VER < 1600 // in VS2010 types below are defined - typedef __int8 int8_t; - typedef __int16 int16_t; - typedef __int32 int32_t; - typedef __int64 int64_t; - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; - typedef unsigned __int64 uint64_t; - -#elif defined(OMIM_OS_BADA) || defined(OMIM_OS_ANDROID) - #include <stdint.h> - -#else - #ifdef OMIM_OS_LINUX - #include <stdint.h> - #endif - #include <boost/cstdint.hpp> - -#endif - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif diff --git a/storage/storage_defines.hpp b/storage/storage_defines.hpp index 5da65a105c..5aa9df921b 100644 --- a/storage/storage_defines.hpp +++ b/storage/storage_defines.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/stdint.hpp" +#include "std/cstdint.hpp" #include "std/string.hpp" #include "std/utility.hpp" |