1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

Little changes to fix broken gcc compilation, hope MSVC still compile

This commit is contained in:
Vadim Glazunov 2008-08-04 20:27:47 +00:00
parent a15ffb06e6
commit 1bd3a677fe
4 changed files with 13 additions and 2 deletions

View File

@ -1,6 +1,8 @@
#ifndef CGAMESTATE_H
#define CGAMESTATE_H
#include "global.h"
#include "../hch/CCreatureHandler.h"
#include "lib/VCMI_Lib.h"
#include <set>
#include <vector>
#ifdef _WIN32

View File

@ -237,7 +237,7 @@ public:
void loadPointer(T &data)
{
std::cout<<"Allocating memory for pointer!"<<std::endl;
typedef boost::remove_pointer<T>::type npT;
typedef typename boost::remove_pointer<T>::type npT;
data = new npT;
*this >> *data;
}

View File

@ -1,3 +1,5 @@
#ifndef VCMI_LIB_H
#define VCMI_LIB_H
#include "../global.h"
class CLodHandler;
@ -55,7 +57,13 @@ public:
//StartInfo scenarioOps;
};
#ifndef __GNUC__
DLL_EXPORT LibClasses * VLC;
#else
extern DLL_EXPORT LibClasses * VLC;
#endif
DLL_EXPORT void initDLL(CLodHandler *b);
DLL_EXPORT void initDLL(CLodHandler *b);
#endif //VCMI_LIB_H

View File

@ -3,6 +3,7 @@
#include <set>
#include "../CGameState.h"
#include "../lib/Connection.h"
#include <boost/thread.hpp>
class CVCMIServer;
class CGameState;
//class CConnection;