[MOAB-dev] r3081 - MOAB/trunk
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Thu Jul 30 15:03:05 CDT 2009
Author: kraftche
Date: 2009-07-30 15:03:05 -0500 (Thu, 30 Jul 2009)
New Revision: 3081
Modified:
MOAB/trunk/MBCN.hpp
MOAB/trunk/MBRange.hpp
MOAB/trunk/TagServer.hpp
Log:
fix some warnings encountered when compiling with icc
Modified: MOAB/trunk/MBCN.hpp
===================================================================
--- MOAB/trunk/MBCN.hpp 2009-07-30 20:02:35 UTC (rev 3080)
+++ MOAB/trunk/MBCN.hpp 2009-07-30 20:03:05 UTC (rev 3081)
@@ -141,49 +141,56 @@
static void SetBasis(const int in_basis);
//! return the string type name for this type
- static const char *EntityTypeName(const MBEntityType this_type);
+ static inline
+ const char *EntityTypeName(const MBEntityType this_type);
//! given a name, find the corresponding entity type
static MBEntityType EntityTypeFromName(const char *name);
//! return the topological entity dimension
- static short int Dimension(const MBEntityType t);
+ static inline
+ short int Dimension(const MBEntityType t);
//! return the number of (corner) vertices contained in the specified type.
- static short int VerticesPerEntity(const MBEntityType t);
+ static inline
+ short int VerticesPerEntity(const MBEntityType t);
//! return the number of sub-entities bounding the entity.
- static short int NumSubEntities(const MBEntityType t, const int d);
+ static inline
+ short int NumSubEntities(const MBEntityType t, const int d);
//! return the type of a particular sub-entity.
//! \param this_type Type of entity for which sub-entity type is being queried
//! \param sub_dimension Topological dimension of sub-entity whose type is being queried
//! \param index Index of sub-entity whose type is being queried
//! \return type Entity type of sub-entity with specified dimension and index
- static MBEntityType SubEntityType(const MBEntityType this_type,
- const int sub_dimension,
- const int index);
+ static inline
+ MBEntityType SubEntityType(const MBEntityType this_type,
+ const int sub_dimension,
+ const int index);
//! return the vertex indices of the specified sub-entity.
//! \param this_type Type of entity for which sub-entity connectivity is being queried
//! \param sub_dimension Dimension of sub-entity
//! \param sub_index Index of sub-entity
//! \param sub_entity_conn Connectivity of sub-entity (returned to calling function)
- static void SubEntityVertexIndices(const MBEntityType this_type,
- const int sub_dimension,
- const int sub_index,
- int sub_entity_conn[]);
+ static inline
+ void SubEntityVertexIndices(const MBEntityType this_type,
+ const int sub_dimension,
+ const int sub_index,
+ int sub_entity_conn[]);
//! return the vertex indices of the specified sub-entity.
//! \param this_type Type of entity for which sub-entity connectivity is being queried
//! \param sub_dimension Dimension of sub-entity
//! \param sub_index Index of sub-entity
//! \param num_sub_ent_vertices the number of vertices in the sub-entity
- static const short* SubEntityVertexIndices( const MBEntityType this_type,
- const int sub_dimension,
- const int sub_index,
- MBEntityType& sub_type,
- int& num_sub_ent_vertices );
+ static inline
+ const short* SubEntityVertexIndices( const MBEntityType this_type,
+ const int sub_dimension,
+ const int sub_index,
+ MBEntityType& sub_type,
+ int& num_sub_ent_vertices );
//! return the node indices of the specified sub-entity.
//! \param this_topo The topology of the queried element type
@@ -336,13 +343,15 @@
//! \param pvec Permutation array
//! \param num_entries Number of indicies in permutation array
//! \param is_reverse Array is reverse permutation
- static void setPermutation(const MBEntityType t, const int dim, int *pvec, const int num_entries,
- const bool is_reverse = false);
+ static inline
+ void setPermutation(const MBEntityType t, const int dim, int *pvec,
+ const int num_entries, const bool is_reverse = false);
//! Reset permutation or reverse permutation vector
//! \param t EntityType whose permutation vector is being reset
//! \param dim Dimension of facets being reset; if -1 is input, all dimensions are reset
- static void resetPermutation(const MBEntityType t, const int dim);
+ static inline
+ void resetPermutation(const MBEntityType t, const int dim);
//! Permute a handle array according to permutation vector set with setPermute;
//! permutation is done in-place
@@ -381,24 +390,27 @@
//! \param num_verts Number of nodes defining entity
//! \return bool Returns true if <em>this_type</em> combined with <em>num_nodes</em> indicates
//! mid-edge nodes are likely
- static bool HasMidEdgeNodes(const MBEntityType this_type,
- const int num_verts);
+ static inline
+ bool HasMidEdgeNodes(const MBEntityType this_type,
+ const int num_verts);
//! true if entities of a given type and number of nodes indicates mid face nodes are present.
//! \param this_type Type of entity for which sub-entity connectivity is being queried
//! \param num_verts Number of nodes defining entity
//! \return bool Returns true if <em>this_type</em> combined with <em>num_nodes</em> indicates
//! mid-face nodes are likely
- static bool HasMidFaceNodes(const MBEntityType this_type,
- const int num_verts);
+ static inline
+ bool HasMidFaceNodes(const MBEntityType this_type,
+ const int num_verts);
//! true if entities of a given type and number of nodes indicates mid region nodes are present.
//! \param this_type Type of entity for which sub-entity connectivity is being queried
//! \param num_verts Number of nodes defining entity
//! \return bool Returns true if <em>this_type</em> combined with <em>num_nodes</em> indicates
//! mid-region nodes are likely
- static bool HasMidRegionNodes(const MBEntityType this_type,
- const int num_verts);
+ static inline
+ bool HasMidRegionNodes(const MBEntityType this_type,
+ const int num_verts);
//! true if entities of a given type and number of nodes indicates mid edge/face/region nodes
//! are present.
@@ -406,15 +418,17 @@
//! \param num_verts Number of nodes defining entity
//! \param mid_nodes If <em>mid_nodes[i], i=1..2</em> is non-zero, indicates that mid-edge
//! (i=1), mid-face (i=2), and/or mid-region (i=3) nodes are likely
- static void HasMidNodes(const MBEntityType this_type,
- const int num_verts,
- int mid_nodes[4]);
+ static inline
+ void HasMidNodes(const MBEntityType this_type,
+ const int num_verts,
+ int mid_nodes[4]);
//! Same as above, except returns a single integer with the bits, from
//! least significant to most significant set to one if the corresponding
//! mid nodes on sub entities of the least dimension (0) to the highest
//! dimension (3) are present in the elment type.
- static int HasMidNodes( const MBEntityType this_type, const int num_verts );
+ static inline
+ int HasMidNodes( const MBEntityType this_type, const int num_verts );
//! given data about an element and a vertex in that element, return the dimension
//! and index of the sub-entity that the vertex resolves. If it does not resolve a
Modified: MOAB/trunk/MBRange.hpp
===================================================================
--- MOAB/trunk/MBRange.hpp 2009-07-30 20:02:35 UTC (rev 3080)
+++ MOAB/trunk/MBRange.hpp 2009-07-30 20:03:05 UTC (rev 3081)
@@ -220,16 +220,16 @@
~MBRange();
//! return the beginning const iterator of this range
- const_iterator begin() const;
+ inline const_iterator begin() const;
//! return the beginning const reverse iterator of this range
- const_reverse_iterator rbegin() const;
+ inline const_reverse_iterator rbegin() const;
//! return the ending const iterator for this range
- const_iterator end() const;
+ inline const_iterator end() const;
//! return the ending const reverse iterator for this range
- const_reverse_iterator rend() const;
+ inline const_reverse_iterator rend() const;
//! return the number of values this Ranges represents
MBEntityHandle size() const;
@@ -239,7 +239,7 @@
//! return whether empty or not
//! always use "if(!Ranges::empty())" instead of "if(Ranges::size())"
- bool empty() const;
+ inline bool empty() const;
//! insert an item into the list and return the iterator for the inserted item
iterator insert(MBEntityHandle val);
@@ -255,12 +255,12 @@
iterator erase( iterator iter1, iterator iter2);
//! erases a value from this container
- iterator erase(MBEntityHandle val);
+ inline iterator erase(MBEntityHandle val);
//! get first entity in range
- const MBEntityHandle& front() const;
+ inline const MBEntityHandle& front() const;
//! get last entity in range
- const MBEntityHandle& back() const;
+ inline const MBEntityHandle& back() const;
//! remove first entity from range
MBEntityHandle pop_front();
//! remove last entity from range
Modified: MOAB/trunk/TagServer.hpp
===================================================================
--- MOAB/trunk/TagServer.hpp 2009-07-30 20:02:35 UTC (rev 3080)
+++ MOAB/trunk/TagServer.hpp 2009-07-30 20:03:05 UTC (rev 3081)
@@ -304,11 +304,11 @@
MBErrorCode get_default_data_ref(const MBTag tag_handle, const void *& data, int& size);
//! get information about a tag
- const TagInfo* get_tag_info(const char *tag_name ) const;
- const TagInfo* get_tag_info( MBTag tag_handle ) const;
- TagInfo* get_tag_info( MBTag tag_handle );
- const TagInfo* get_tag_info( MBTagId id, MBTagType storage ) const;
- TagInfo* get_tag_info( MBTagId id, MBTagType storage );
+ inline const TagInfo* get_tag_info(const char *tag_name ) const;
+ inline const TagInfo* get_tag_info( MBTag tag_handle ) const;
+ inline TagInfo* get_tag_info( MBTag tag_handle );
+ inline const TagInfo* get_tag_info( MBTagId id, MBTagType storage ) const;
+ inline TagInfo* get_tag_info( MBTagId id, MBTagType storage );
unsigned long get_memory_use( MBTag tag_handle ) const;
More information about the moab-dev
mailing list