Fix namespace issue, missing parens, missing func
This commit is contained in:
parent
9200bba41d
commit
91a9b75d40
|
@ -47,7 +47,7 @@ SET(SRC_GTK
|
|||
soundconfig.cpp
|
||||
screenarea.cpp
|
||||
screenarea-cairo.cpp
|
||||
#screenarea-opengl.cpp
|
||||
screenarea-opengl.cpp
|
||||
tools.cpp
|
||||
window.cpp
|
||||
../sdl/inputSDL.cpp
|
||||
|
|
|
@ -49,7 +49,7 @@ ScreenArea::ScreenArea(int _iWidth, int _iHeight, int _iScale)
|
|||
pixbuf->fill(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
|
||||
m_poEmptyCursor = Gdk::Cursor::create(get_display(), pixbuf, 0, 0);
|
||||
#endif
|
||||
|
|
|
@ -85,14 +85,10 @@ enum yytokentype {
|
|||
/* Copy the first part of user declarations. */
|
||||
#line 1 "expr.ypp"
|
||||
|
||||
namespace std {
|
||||
#include <memory.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
}
|
||||
|
||||
using namespace std;
|
||||
#include <cstdlib>
|
||||
|
||||
#include "../System.h"
|
||||
#include "../gba/elf.h"
|
||||
|
|
|
@ -1,12 +1,9 @@
|
|||
%{
|
||||
namespace std {
|
||||
#include <stdio.h>
|
||||
#include <memory.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <cstdlib>
|
||||
}
|
||||
|
||||
|
||||
#include "../System.h"
|
||||
#include "../gba/elf.h"
|
||||
#include "exprNode.h"
|
||||
|
|
Loading…
Reference in New Issue