From 0e8eb8c48efc24a0794c253caaa5a01639b8e80c Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 13 Jul 2023 12:20:14 +0200 Subject: [PATCH] Removed _MSC_VER <= 1500 checks for Visual Studio 2008 or earlier. Our codebase requires VS2012+ since a while. --- backends/imgui_impl_opengl2.cpp | 4 ---- backends/imgui_impl_opengl3.cpp | 4 ---- backends/imgui_impl_sdlrenderer2.cpp | 4 ---- backends/imgui_impl_sdlrenderer3.cpp | 4 ---- imgui.cpp | 4 ---- imgui_demo.cpp | 4 ---- imgui_tables.cpp | 4 ---- imgui_widgets.cpp | 4 ---- 8 files changed, 32 deletions(-) diff --git a/backends/imgui_impl_opengl2.cpp b/backends/imgui_impl_opengl2.cpp index 2fd0d2b28..04c19d67d 100644 --- a/backends/imgui_impl_opengl2.cpp +++ b/backends/imgui_impl_opengl2.cpp @@ -39,11 +39,7 @@ #include "imgui.h" #ifndef IMGUI_DISABLE #include "imgui_impl_opengl2.h" -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t -#endif // Clang/GCC warnings with -Weverything #if defined(__clang__) diff --git a/backends/imgui_impl_opengl3.cpp b/backends/imgui_impl_opengl3.cpp index ae01d58f6..e511cf814 100644 --- a/backends/imgui_impl_opengl3.cpp +++ b/backends/imgui_impl_opengl3.cpp @@ -107,11 +107,7 @@ #ifndef IMGUI_DISABLE #include "imgui_impl_opengl3.h" #include -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t -#endif #if defined(__APPLE__) #include #endif diff --git a/backends/imgui_impl_sdlrenderer2.cpp b/backends/imgui_impl_sdlrenderer2.cpp index a08496a5b..ef38eae22 100644 --- a/backends/imgui_impl_sdlrenderer2.cpp +++ b/backends/imgui_impl_sdlrenderer2.cpp @@ -26,11 +26,7 @@ #include "imgui.h" #ifndef IMGUI_DISABLE #include "imgui_impl_sdlrenderer2.h" -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t -#endif // Clang warnings with -Weverything #if defined(__clang__) diff --git a/backends/imgui_impl_sdlrenderer3.cpp b/backends/imgui_impl_sdlrenderer3.cpp index e1bce4a79..417157267 100644 --- a/backends/imgui_impl_sdlrenderer3.cpp +++ b/backends/imgui_impl_sdlrenderer3.cpp @@ -21,11 +21,7 @@ #include "imgui.h" #ifndef IMGUI_DISABLE #include "imgui_impl_sdlrenderer3.h" -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t -#endif // Clang warnings with -Weverything #if defined(__clang__) diff --git a/imgui.cpp b/imgui.cpp index 68fb6c691..55a4dc4ec 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -934,11 +934,7 @@ CODE // System includes #include // vsnprintf, sscanf, printf -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t -#endif // [Windows] On non-Visual Studio compilers, we default to IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS unless explicitly enabled #if defined(_WIN32) && !defined(_MSC_VER) && !defined(IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS) && !defined(IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index bf1384b15..1f16bb9d6 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -93,11 +93,7 @@ Index of this file: #include // sqrtf, powf, cosf, sinf, floorf, ceilf #include // vsnprintf, sscanf, printf #include // NULL, malloc, free, atoi -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t -#endif // Visual Studio warnings #ifdef _MSC_VER diff --git a/imgui_tables.cpp b/imgui_tables.cpp index 59980d8f5..ec87fa6e1 100644 --- a/imgui_tables.cpp +++ b/imgui_tables.cpp @@ -198,11 +198,7 @@ Index of this file: #include "imgui_internal.h" // System includes -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t -#endif // Visual Studio warnings #ifdef _MSC_VER diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp index 412984a9c..d79d1e7c2 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -41,11 +41,7 @@ Index of this file: #include "imgui_internal.h" // System includes -#if defined(_MSC_VER) && _MSC_VER <= 1500 // MSVC 2008 or earlier -#include // intptr_t -#else #include // intptr_t -#endif //------------------------------------------------------------------------- // Warnings