Changed: #1272 Fixed compilation with GCC 4.6 (patch provided by Naush)

This commit is contained in:
kervala 2011-05-24 13:37:04 +02:00
parent 14622fdf7d
commit abdd31fa8c
7 changed files with 8 additions and 1 deletions

View file

@ -34,6 +34,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h>
#include <math.h> #include <math.h>

View file

@ -52,10 +52,11 @@ struct CCyclicActionInfos
TDataSetRow TargetRowId; TDataSetRow TargetRowId;
std::vector<NLMISC::CSheetId> CyclicActionBricks; std::vector<NLMISC::CSheetId> CyclicActionBricks;
CCyclicActionInfos() { }
inline void reset() { CyclicActionBricks.clear(); } inline void reset() { CyclicActionBricks.clear(); }
}; };
static const CCyclicActionInfos NoCyclicInfo; static const CCyclicActionInfos NoCyclicInfo = CCyclicActionInfos();
class CPhraseManager; class CPhraseManager;

View file

@ -21,6 +21,7 @@
#include <libxml/parser.h> #include <libxml/parser.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View file

@ -18,6 +18,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h>
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>

View file

@ -25,6 +25,7 @@
#include <string> #include <string>
#include <time.h> #include <time.h>
#include <vector> #include <vector>
#include <stddef.h>
#include "nel/georges/load_form.h" #include "nel/georges/load_form.h"
#include "nel/georges/u_form.h" #include "nel/georges/u_form.h"

View file

@ -32,6 +32,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h>
#include <math.h> #include <math.h>

View file

@ -18,6 +18,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h>
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>