From 1b7224cdf966eb192e7fbc700823fd6dac03a35b Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 2 Apr 2017 17:18:57 +0200 Subject: [PATCH] set enum size dependent on word size --- src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx b/src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx index c7f28a7ed6..0753fb4ab2 100644 --- a/src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx +++ b/src/3rdParty/salomesmesh/inc/SMDSAbs_ElementType.hxx @@ -27,10 +27,12 @@ #ifndef _SMDSAbs_ElementType_HeaderFile #define _SMDSAbs_ElementType_HeaderFile +#include + /////////////////////////////////////////////////////////////////////////////// /// Type (node, edge, face or volume) of elements /////////////////////////////////////////////////////////////////////////////// -enum SMDSAbs_ElementType : unsigned long +enum SMDSAbs_ElementType : size_t { SMDSAbs_All, SMDSAbs_Node, @@ -43,7 +45,7 @@ enum SMDSAbs_ElementType : unsigned long }; /*! enumeration for element geometry type */ -enum SMDSAbs_GeometryType : unsigned long +enum SMDSAbs_GeometryType : size_t { // 0D element SMDSGeom_POINT, @@ -67,7 +69,7 @@ enum SMDSAbs_GeometryType : unsigned long }; -enum SMDSAbs_ElementOrder : unsigned long +enum SMDSAbs_ElementOrder : size_t { ORDER_ANY, /*! entities of any order */ ORDER_LINEAR, /*! entities of 1st order */ @@ -77,7 +79,7 @@ enum SMDSAbs_ElementOrder : unsigned long /*! * Enumeration of entity type used in mesh info array */ -enum SMDSAbs_EntityType : unsigned long +enum SMDSAbs_EntityType : size_t { SMDSEntity_Node, SMDSEntity_0D,