Skip to content

Fix C++17 MSVC compilation error #1055

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

Merged
robertosfield merged 1 commit into from
Mar 29, 2021
Merged

Fix C++17 MSVC compilation error #1055

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
6 changes: 3 additions & 3 deletions src/osg/DisplaySettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
#include <algorithm>
#include <string.h>

using namespace osg;
using namespace std;

#if defined(_WIN32) && !defined(__CYGWIN__)
#include<windows.h>
extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; }
#else
extern "C" { int NvOptimusEnablement=0x00000001; }
#endif

using namespace osg;
using namespace std;

void DisplaySettings::setNvOptimusEnablement(int value)
{
NvOptimusEnablement = value;
Expand Down
1 change: 0 additions & 1 deletion src/osgPlugins/cfg/ConfigParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@
#include "CameraConfig.h"


using namespace std;
using namespace osgProducer;

static void ConfigParser_error( const char * );
Expand Down
1 change: 0 additions & 1 deletion src/osgPlugins/cfg/ConfigParser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include <Producer/CameraConfig>


using namespace std;
using namespace Producer;

static void ConfigParser_error( const char * );
Expand Down