Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport from 6 ➡️ 3 - Disable C4275 warnings on Windows from OgreUTFString (#621) #707

Merged
merged 1 commit into from
Aug 16, 2022
Merged

Backport from 6 ➡️ 3 - Disable C4275 warnings on Windows from OgreUTFString (#621) #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ogre/include/ignition/rendering/ogre/OgreIncludes.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#pragma GCC system_header
#else
#pragma warning(push, 0)
#pragma warning(disable:4275)
#pragma warning(disable:4005)
#endif

// This prevents some deprecation #warning messages on OSX 10.9
Expand Down
2 changes: 2 additions & 0 deletions ogre/src/OgreRenderTarget.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
# pragma GCC diagnostic ignored "-Wunused-parameter"
#else
# pragma warning(push, 0)
# pragma warning(disable: 4005)
# pragma warning(disable: 4275)
#endif
// leave this out of OgreIncludes as it conflicts with other files requiring
// gl.h
Expand Down
4 changes: 2 additions & 2 deletions ogre2/src/Ogre2RenderEngine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void Ogre2RenderEngine::Destroy()
delete this->ogreLogManager;
this->ogreLogManager = nullptr;

#if not (__APPLE__ || _WIN32)
#if !defined(__APPLE__) && !defined(_WIN32)
if (this->dummyDisplay)
{
Display *x11Display = static_cast<Display*>(this->dummyDisplay);
Expand Down Expand Up @@ -328,7 +328,7 @@ void Ogre2RenderEngine::CreateLogger()
//////////////////////////////////////////////////
void Ogre2RenderEngine::CreateContext()
{
#if not (__APPLE__ || _WIN32)
#if !defined(__APPLE__) && !defined(_WIN32)
// create X11 display
this->dummyDisplay = XOpenDisplay(0);
Display *x11Display = static_cast<Display*>(this->dummyDisplay);
Expand Down
7 changes: 7 additions & 0 deletions ogre2/src/Ogre2RenderTarget.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,16 @@ void Ogre2RenderTarget::RebuildMaterial()
//////////////////////////////////////////////////
// Ogre2RenderTexture
//////////////////////////////////////////////////
#ifndef _WIN32
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
Ogre2RenderTexture::Ogre2RenderTexture()
{
}
#ifndef _WIN32
#pragma GCC diagnostic pop
#endif

//////////////////////////////////////////////////
Ogre2RenderTexture::~Ogre2RenderTexture()
Expand Down