CIrrDeviceStub.cpp Compilation Failure in Trunk

[dejai]

Compiling trunk this afternoon I came across the following compilation error: (I am posting here because it breaks trunk)

Code: Select all

 
g++ -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing -g -D_DEBUG -I../../include -Izlib -Ijpeglib -Ilibpng -I/usr/X11R6/include -DIRRLICHT_EXPORTS=1  -c -o CIrrDeviceStub.o CIrrDeviceStub.cpp
CIrrDeviceStub.cpp: In constructor 'irr::CIrrDeviceStub::CIrrDeviceStub(const irr::SIrrlichtCreationParameters&)':
CIrrDeviceStub.cpp:25:2: error: expected '{' before 'FileSystem'
CIrrDeviceStub.cpp: At global scope:
CIrrDeviceStub.cpp:25:12: error: expected constructor, destructor, or type conversion before '(' token
CIrrDeviceStub.cpp:429:1: error: expected '}' at end of input
make: *** [CIrrDeviceStub.o] Error 1
 

Looking at the code I noticed it was malformed, probably one of the developers editors screwed up. Note the missing semicolon and the double use of close and creation params.

Code: Select all

 
CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
: IrrlichtDevice(), VideoDriver(0), GUIEnvironment(0), SceneManager(0),
    Timer(0), CursorControl(0), UserReceiver(params.EventReceiver), Logger(0), Operator(0),
    Randomizer(0), FileSystem(0), InputReceivingSceneManager(0),
    VideoModeList(0), CreationParams(params), Close(false)
    FileSystem(0), InputReceivingSceneManager(0), VideoModeList(0),
    CreationParams(params), Close(false)
{
 

Really simple fix:

Code: Select all

 
CIrrDeviceStub::CIrrDeviceStub(const SIrrlichtCreationParameters& params)
: IrrlichtDevice(), VideoDriver(0), GUIEnvironment(0), SceneManager(0),
    Timer(0), CursorControl(0), UserReceiver(params.EventReceiver), Logger(0), Operator(0),
    Randomizer(0), FileSystem(0), InputReceivingSceneManager(0),
    VideoModeList(0), CreationParams(params), Close(false)
{
 

Seems easier just to edit the file then submit a patch.

[hybrid]

Already reported in the SVN bugs thread and also fixed already in the 1.8 branch. I just forgot to merge down to trunk. This bug had been introduced in a merge conflict from 1.7 to 1.8, and went further down to trunk then. Gonna fix it right now