Cleanup C++ compiler macros usage #1609
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pepone
approved these changes
Dec 19, 2023
| @@ -109,7 +109,7 @@ | |||
| // | |||
| #if (ICE_CPLUSPLUS >= 201103) || \ | |||
| ((defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__* 100) + __GNUC_MINOR__) >= 405)) || \ | |||
There was a problem hiding this comment.
Not clear that we need to keep this branch with __GXX_EXPERIMENTAL_CXX0X__
There was a problem hiding this comment.
We'll want to clean this up anyway soon since all our compilers will be c++11 at least.
There was a problem hiding this comment.
I'll leave it like it is for now.
cpp/src/IceUtil/UtilException.cpp
Outdated
| @@ -43,7 +43,7 @@ | |||
| # endif | |||
| # endif | |||
|
|
|||
| # if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS) | |||
| # if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(ICE_STATIC_LIBS) | |||
There was a problem hiding this comment.
We can also remove !defined(__sun) as we removed other Sun related macros
| # endif | ||
| # define DBGHELP_TRANSLATE_TCHAR | ||
| # include <IceUtil/StringConverter.h> | ||
| # pragma warning(disable:4091) // VS 2015 RC issues this warning for code in DbgHelp.h |
There was a problem hiding this comment.
Can you add a TODO for this one, not clear it is required with Visual Studio 2022
|
I also removed Atomic.h |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is a backport of 158c193