Compiler warning fixes for Visual Studio 2010 #571
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
paroj
requested changes
Nov 15, 2017
| #ifndef OGRE_HAS_CXX11_EXPLICIT_CONVERSION_OPERATORS | ||
| # pragma warning ( push ) | ||
| # pragma warning ( disable: 4800 ) | ||
| #endif | ||
| return (bool)mDataStream; |
There was a problem hiding this comment.
I think mDataStream != 0 would be a better fix instead of using the pragmas and associated compiler checks for fixing C4800.
There was a problem hiding this comment.
I agree. I'll try this.
paroj
reviewed
Nov 15, 2017
| @@ -66,7 +66,11 @@ namespace Ogre | |||
|
|
|||
| bool TerrainLodManager::isOpen() const | |||
| { | |||
| #ifndef OGRE_HAS_CXX11_EXPLICIT_CONVERSION_OPERATORS | |||
| return mDataStream != 0; | |||
There was a problem hiding this comment.
sorry, this should have been mDataStream.get() != 0; as SharedPtr lacks a != operator for ptr. Also you can drop the ifdefs as this method will also work with OGRE_HAS_CXX11_EXPLICIT_CONVERSION_OPERATORS
There was a problem hiding this comment.
Ok, I'll change it. I wonder why it compiled without warnings.
There was a problem hiding this comment.
Should I drop the new OGRE_HAS_CXX11_EXPLICIT_CONVERSION_OPERATORS define as well since it's no longer needed?
paroj
reviewed
Nov 15, 2017
| @@ -361,6 +361,10 @@ namespace Ogre { | |||
| */ | |||
| virtual ResourcePtr getByHandle(ResourceHandle handle); | |||
|
|
|||
| #ifndef OGRE_HAS_CXX11_EXPLICIT_CONVERSION_OPERATORS | |||
…e and compare against the pointer properly.
paroj
approved these changes
Nov 15, 2017
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.
No description provided.