diff options
| author | Tartalo <none@none> | 2010-06-08 21:11:41 +0200 |
|---|---|---|
| committer | Tartalo <none@none> | 2010-06-08 21:11:41 +0200 |
| commit | 481611614983d0a137672a2ff96f7b011400ccb2 (patch) | |
| tree | 9405466232cfa7de615c0ca41e89bc25296278e8 /src/server/shared | |
| parent | 220d4fa29c73a6706b9413f93be8c860867f4915 (diff) | |
| parent | a85cd74fbd33f7683817a2224b870ccdcdf64b3c (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Dynamic/CountedReference/Reference.h | 4 | ||||
| -rw-r--r-- | src/server/shared/Dynamic/TypeContainer.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/shared/Dynamic/CountedReference/Reference.h b/src/server/shared/Dynamic/CountedReference/Reference.h index d3cfe55ffc0..bdc06a572c9 100644 --- a/src/server/shared/Dynamic/CountedReference/Reference.h +++ b/src/server/shared/Dynamic/CountedReference/Reference.h @@ -33,8 +33,8 @@ */ #include <stdexcept> -#include "Platform/Define.h" -#include "Policies/ThreadingModel.h" +#include "Define.h" +#include "ThreadingModel.h" #include "ReferenceHolder.h" template diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h index 0fa61f5e562..4ed07431ee3 100644 --- a/src/server/shared/Dynamic/TypeContainer.h +++ b/src/server/shared/Dynamic/TypeContainer.h @@ -30,7 +30,7 @@ #include <vector> #include "Define.h" #include "Dynamic/TypeList.h" -#include "Grids/GridRefManager.h" +#include "GridRefManager.h" /* * @class ContainerMapList is a mulit-type container for map elements |