diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
commit | b1c4118a33f669f8be7131c7d37b34dbe63ff545 (patch) | |
tree | 468fdf51066947dd8254753ee98163be97d0d0b8 /src/server/shared/Dynamic | |
parent | f237a57f51c0473bda90bae7a06bd5b9c187754b (diff) | |
parent | 8d049545de87595a84e6e2c54d7b44b354644144 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/shared/Dynamic')
-rwxr-xr-x | src/server/shared/Dynamic/TypeContainerFunctions.h | 4 | ||||
-rwxr-xr-x | src/server/shared/Dynamic/TypeContainerVisitor.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h index 19ebfb3adfc..5011ec1c1be 100755 --- a/src/server/shared/Dynamic/TypeContainerFunctions.h +++ b/src/server/shared/Dynamic/TypeContainerFunctions.h @@ -36,7 +36,7 @@ namespace Trinity template<class SPECIFIC_TYPE> size_t Count(const ContainerMapList<SPECIFIC_TYPE> &elements, SPECIFIC_TYPE* /*fake*/) { return elements._element.getSize(); - }; + } template<class SPECIFIC_TYPE> size_t Count(const ContainerMapList<TypeNull> &/*elements*/, SPECIFIC_TYPE* /*fake*/) { @@ -64,7 +64,7 @@ namespace Trinity //elements._element[hdl] = obj; obj->AddToGrid(elements._element); return obj; - }; + } template<class SPECIFIC_TYPE> SPECIFIC_TYPE* Insert(ContainerMapList<TypeNull> &/*elements*/, SPECIFIC_TYPE * /*obj*/) { diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h index beddb31f343..155989f15f6 100755 --- a/src/server/shared/Dynamic/TypeContainerVisitor.h +++ b/src/server/shared/Dynamic/TypeContainerVisitor.h @@ -35,7 +35,7 @@ template<class T, class Y> class TypeContainerVisitor; template<class VISITOR, class TYPE_CONTAINER> void VisitorHelper(VISITOR &v, TYPE_CONTAINER &c) { v.Visit(c); -}; +} // terminate condition for container list template<class VISITOR> void VisitorHelper(VISITOR &v, ContainerList<TypeNull> &c) |