Fix namespace issue, missing parens, missing func

This commit is contained in:
Renato "Lond" Cerqueira 2016-10-23 16:02:40 +02:00 committed by Rafael Kitover
parent 9200bba41d
commit 91a9b75d40
4 changed files with 4 additions and 11 deletions

View File

@ -47,7 +47,7 @@ SET(SRC_GTK
soundconfig.cpp soundconfig.cpp
screenarea.cpp screenarea.cpp
screenarea-cairo.cpp screenarea-cairo.cpp
#screenarea-opengl.cpp screenarea-opengl.cpp
tools.cpp tools.cpp
window.cpp window.cpp
../sdl/inputSDL.cpp ../sdl/inputSDL.cpp

View File

@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int _iHeight, int _iScale)
pixbuf->fill(0); pixbuf->fill(0);
#if !GTK_CHECK_VERSION(3, 0, 0) #if !GTK_CHECK_VERSION(3, 0, 0)
m_poEmptyCursor = new Gdk::Cursor(get_display, pixbuf, 0, 0); m_poEmptyCursor = new Gdk::Cursor(get_display(), pixbuf, 0, 0);
#else #else
m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0); m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0);
#endif #endif

View File

@ -85,14 +85,10 @@ enum yytokentype {
/* Copy the first part of user declarations. */ /* Copy the first part of user declarations. */
#line 1 "expr.ypp" #line 1 "expr.ypp"
namespace std {
#include <memory.h> #include <memory.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
} #include <cstdlib>
using namespace std;
#include "../System.h" #include "../System.h"
#include "../gba/elf.h" #include "../gba/elf.h"

View File

@ -1,12 +1,9 @@
%{ %{
namespace std {
#include <stdio.h> #include <stdio.h>
#include <memory.h> #include <memory.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <cstdlib> #include <cstdlib>
}
#include "../System.h" #include "../System.h"
#include "../gba/elf.h" #include "../gba/elf.h"
#include "exprNode.h" #include "exprNode.h"