DataDirLocater.h

[sombriks]

sorry for so extensible usage of forum instead bugtracker; something is wrong (at least to me) with mantis.

DataDirLocater.h have the following lines:

Code: Select all

class DataDirLocater
{
public:
	DataDirLocater(){}
	void LocateDataDirs(){}
//...

please someone change it to

Code: Select all

class DataDirLocater
{
public:
	DataDirLocater();
	void LocateDataDirs();
//...

without these modifications, my compilation process throws that error:

Code: Select all

leonardo@leonardo:/home/ftp/src/spring/trunk$ make
Updating bitmaps.sdz
Updating springcontent.sdz
Updating maphelper.sdz
Updating cursors.sdz
[  0%] Built target gamedata
[ 11%] Built target streflop
[ 16%] Built target lua
[ 19%] Built target luabind
[ 21%] Built target 7zip
[ 22%] Built target hpiutil2
[ 22%] Built target gml
[ 23%] Built target minizip
Scanning dependencies of target spring
[ 23%] Building CXX object rts/CMakeFiles/spring.dir/System/Platform/FileSystem.cpp.o
[ 23%] Building CXX object rts/CMakeFiles/spring.dir/System/Platform/Linux/DataDirLocater.cpp.o
/home/ftp/src/spring/trunk/rts/System/Platform/Linux/DataDirLocater.cpp:53: error: redefinition of 'DataDirLocater::DataDirLocater()'
/home/ftp/src/spring/trunk/rts/System/Platform/Linux/DataDirLocater.h:24: error: 'DataDirLocater::DataDirLocater()' previously defined here
/home/ftp/src/spring/trunk/rts/System/Platform/Linux/DataDirLocater.cpp:216: error: redefinition of 'void DataDirLocater::LocateDataDirs()'
/home/ftp/src/spring/trunk/rts/System/Platform/Linux/DataDirLocater.h:25: error: 'void DataDirLocater::LocateDataDirs()' previously defined here
make[2]: ** [rts/CMakeFiles/spring.dir/System/Platform/Linux/DataDirLocater.cpp.o] Erro 1
make[1]: ** [rts/CMakeFiles/spring.dir/all] Erro 2
make: ** [all] Erro 2
leonardo@leonardo:/home/ftp/src/spring/trunk$                  

next thig that i fould i will try to put in mantis, promise.

[Kloot]

Fixed (again).

[zerver]

Fixed (again).

Sorry, I'm the guilty one... I changed it to make it compile with MSVS.