Skip to content

Commit

Permalink
Merge pull request arcaneframework#1628 from arcaneframework/dev/gg-r…
Browse files Browse the repository at this point in the history 
…emove-unused-private-methods

Remove unused methods of 'Item', 'ItemInternal' and 'ItemBase'
  • Loading branch information
@grospelliergilles
grospelliergilles authored Sep 12, 2024
2 parents 1b3b079 + 46649cb commit 428c7f8
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 75 deletions.
20 changes: 12 additions & 8 deletions arcane/src/arcane/core/Item.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ class ARCANE_CORE_EXPORT Item
*/
class Index
{
// TODO Rendre obsolète lorsqu'on aura supprimer
// les classes dérivées qui sont obsolètes.
// On ne peut pas le faire avant car cela génère trop
// d'avertissements de compilation.
public:
Index() : m_local_id(NULL_ITEM_LOCAL_ID){}
explicit Index(Int32 id) : m_local_id(id){}
Expand Down Expand Up @@ -323,15 +327,15 @@ class ARCANE_CORE_EXPORT Item

public:

/*!
/*!
* \brief Partie interne de l'entité.
*
* \warning La partie interne de l'entité ne doit être modifiée que
* par ceux qui savent ce qu'ils font.
* \deprecated Utiliser itemBase() ou mutableItemBase() à la place pour
* les cas l'instance retournée n'est pas conservée.
*/
ARCANE_DEPRECATED_REASON("This method is internal to Arcane. use itemBase() or mutableItemBase() instead")
ARCANE_DEPRECATED_REASON("Y2024: This method is internal to Arcane. use itemBase() or mutableItemBase() instead")
ItemInternal* internal() const
{
if (m_local_id!=NULL_ITEM_LOCAL_ID)
Expand Down Expand Up @@ -575,8 +579,8 @@ class ARCANE_CORE_EXPORT Node
/*!
* \brief Index d'un Node dans une variable.
* \deprecated
*/
class Index
*/
class ARCANE_DEPRECATED_REASON("Y2024: Use NodeLocalId instead") Index
: public Item::Index
{
public:
Expand Down Expand Up @@ -810,7 +814,7 @@ class ARCANE_CORE_EXPORT Edge
* \brief Index d'une Edge dans une variable.
* \deprecated
*/
class Index
class ARCANE_DEPRECATED_REASON("Y2024: Use EdgeLocalId instead") Index
: public Item::Index
{
public:
Expand Down Expand Up @@ -944,7 +948,7 @@ class ARCANE_CORE_EXPORT Face
* \brief Index d'une Face dans une variable.
* \deprecated
*/
class Index
class ARCANE_DEPRECATED_REASON("Y2024: Use FaceLocalId instead") Index
: public Item::Index
{
public:
Expand Down Expand Up @@ -1189,8 +1193,8 @@ class ARCANE_CORE_EXPORT Cell
/*!
* \brief Index d'une Cell dans une variable.
* \deprecated
*/
class Index
*/
class ARCANE_DEPRECATED_REASON("Y2024: Use CellLocalId instead") Index
: public Item::Index
{
public:
Expand Down
75 changes: 8 additions & 67 deletions arcane/src/arcane/core/ItemInternal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,17 +204,6 @@ class ARCANE_CORE_EXPORT ItemInternalConnectivityList

private:

/*!
* \brief Liste des localId() des entités de type \a item_kind
* connectées à l'entité de de localid() \a lid.
*/
const Int32* itemLocalIds(Int32 item_kind,Int32 lid) const
{
// TODO: Supprimer à terme cette méthode car elle ne retourne pas l'offset
// associé à l'entité
return m_container[item_kind].itemLocalIdsData(lid);
}

/*!
* \brief localId() de la \a index-ème entité de type \a item_kind
* connectés à l'entité de de localid() \a lid.
Expand Down Expand Up @@ -286,21 +275,6 @@ class ARCANE_CORE_EXPORT ItemInternalConnectivityList
return m_container[item_kind].containerView();
}

private:

ARCANE_DEPRECATED_REASON("Y2023: This method is internal to Arcane and should not be used.")
ItemInternal* nodeV2(Int32 lid,Int32 aindex) const { return m_items->nodes[ _nodeLocalIdV2(lid,aindex) ]; }
ARCANE_DEPRECATED_REASON("Y2023: This method is internal to Arcane and should not be used.")
ItemInternal* edgeV2(Int32 lid,Int32 aindex) const { return m_items->edges[ _edgeLocalIdV2(lid,aindex) ]; }
ARCANE_DEPRECATED_REASON("Y2023: This method is internal to Arcane and should not be used.")
ItemInternal* faceV2(Int32 lid,Int32 aindex) const { return m_items->faces[ _faceLocalIdV2(lid,aindex) ]; }
ARCANE_DEPRECATED_REASON("Y2023: This method is internal to Arcane and should not be used.")
ItemInternal* cellV2(Int32 lid,Int32 aindex) const { return m_items->cells[ _cellLocalIdV2(lid,aindex) ]; }
ARCANE_DEPRECATED_REASON("Y2023: This method is internal to Arcane and should not be used.")
ItemInternal* hParentV2(Int32 lid,Int32 aindex) const { return m_items->cells[ _hParentLocalIdV2(lid,aindex) ]; }
ARCANE_DEPRECATED_REASON("Y2023: This method is internal to Arcane and should not be used.")
ItemInternal* hChildV2(Int32 lid,Int32 aindex) const { return m_items->cells[ _hChildLocalIdV2(lid,aindex) ]; }

public:

ItemBaseBuildInfo nodeBase(Int32 lid,Int32 aindex) const
Expand All @@ -327,6 +301,8 @@ class ARCANE_CORE_EXPORT ItemInternalConnectivityList

private:

// Ces 4 méthodes sont encore utilisées par ItemBase via internalNodes(), internalEdges(), ...
// On pourra les supprimer quand ces méthodes obsolètes seront supprimées
ItemInternalVectorView nodesV2(Int32 lid) const { return { A_INTERNAL_SI(node),_itemLocalIdListView(NODE_IDX,lid) }; }
ItemInternalVectorView edgesV2(Int32 lid) const { return { A_INTERNAL_SI(edge),_itemLocalIdListView(EDGE_IDX,lid) }; }
ItemInternalVectorView facesV2(Int32 lid) const { return { A_INTERNAL_SI(face),_itemLocalIdListView(FACE_IDX,lid) }; }
Expand All @@ -337,24 +313,6 @@ class ARCANE_CORE_EXPORT ItemInternalConnectivityList
FaceLocalIdView faceLocalIdsView(Int32 lid) const { return FaceLocalIdView(_itemLocalIdListView(FACE_IDX,lid)); }
CellLocalIdView cellLocalIdsView(Int32 lid) const { return CellLocalIdView(_itemLocalIdListView(CELL_IDX,lid)); }

private:

// NOTE: Ces 4 méthodes n'utilisent pas les offsets et ne doivent
// donc pas être utilisées à terme
Int32ConstArrayView nodeLocalIdsV2(Int32 lid) const { return { _nbNodeV2(lid), _nodeLocalIdsV2(lid) }; }
Int32ConstArrayView edgeLocalIdsV2(Int32 lid) const { return { _nbEdgeV2(lid), _edgeLocalIdsV2(lid) }; }
Int32ConstArrayView faceLocalIdsV2(Int32 lid) const { return { _nbFaceV2(lid), _faceLocalIdsV2(lid) }; }
Int32ConstArrayView cellLocalIdsV2(Int32 lid) const { return { _nbCellV2(lid), _cellLocalIdsV2(lid) }; }

// NOTE: Ces 6 méthodes n'utilisent pas les offsets et ne doivent
// donc pas être utilisées à terme
const Int32* _nodeLocalIdsV2(Int32 lid) const { return itemLocalIds(NODE_IDX,lid); }
const Int32* _edgeLocalIdsV2(Int32 lid) const { return itemLocalIds(EDGE_IDX,lid); }
const Int32* _faceLocalIdsV2(Int32 lid) const { return itemLocalIds(FACE_IDX,lid); }
const Int32* _cellLocalIdsV2(Int32 lid) const { return itemLocalIds(CELL_IDX,lid); }
const Int32* _hParentLocalIdsV2(Int32 lid) const { return itemLocalIds(HPARENT_IDX,lid); }
const Int32* _hChildLocalIdsV2(Int32 lid) const { return itemLocalIds(HCHILD_IDX,lid); }

private:

Int32 _nodeLocalIdV2(Int32 lid,Int32 index) const { return itemLocalId(NODE_IDX,lid,index); }
Expand Down Expand Up @@ -742,17 +700,6 @@ class ARCANE_CORE_EXPORT ItemBase
ItemBase hChildBase(Int32 index) const { return _connectivity()->hChildBase(m_local_id, index, m_shared_info); }
inline ItemBase parentBase(Int32 index) const;

private:

ARCANE_DEPRECATED_REASON("Y2022: This method is internal to Arcane and should not be used.")
Int32ConstArrayView nodeIds() const { return _connectivity()->nodeLocalIdsV2(m_local_id); }
ARCANE_DEPRECATED_REASON("Y2022: This method is internal to Arcane and should not be used.")
Int32ConstArrayView edgeIds() const { return _connectivity()->edgeLocalIdsV2(m_local_id); }
ARCANE_DEPRECATED_REASON("Y2022: This method is internal to Arcane and should not be used.")
Int32ConstArrayView faceIds() const { return _connectivity()->faceLocalIdsV2(m_local_id); }
ARCANE_DEPRECATED_REASON("Y2022: This method is internal to Arcane and should not be used.")
Int32ConstArrayView cellIds() const { return _connectivity()->cellLocalIdsV2(m_local_id); }

public:

/*!
Expand All @@ -773,10 +720,10 @@ class ARCANE_CORE_EXPORT ItemBase

public:

ARCANE_DEPRECATED_REASON("This method is internal to Arcane.")
ARCANE_DEPRECATED_REASON("Y2024: This method is internal to Arcane.")
inline ItemInternal* itemInternal() const;

ARCANE_DEPRECATED_REASON("This method is internal to Arcane.")
ARCANE_DEPRECATED_REASON("Y2024: This method is internal to Arcane.")
ItemInternalVectorView _internalActiveCells(Int32Array& local_ids) const
{
return _internalActiveCells2(local_ids);
Expand Down Expand Up @@ -814,7 +761,6 @@ class ARCANE_CORE_EXPORT ItemBase
m_local_id = rhs.m_local_id;
m_shared_info = rhs.m_shared_info;
}
// TODO rendre obsolète
ItemInternalVectorView _internalActiveCells2(Int32Array& local_ids) const;
};

Expand Down Expand Up @@ -982,7 +928,6 @@ class ARCANE_CORE_EXPORT ItemInternal

public:

// TODO: Rendre obsolète les trois méthodes suivantes.
// Il faut utiliser la méthode correspondante de ItemBase

//! Maille connectée à l'entité si l'entité est une entité sur la frontière (0 si aucune)
Expand Down Expand Up @@ -1031,7 +976,6 @@ class ARCANE_CORE_EXPORT ItemInternal

public:

// TODO: Rendre obsolète (utiliser nodeBase(), edgeBase(), ... à la place)
ARCANE_DEPRECATED_REASON("Y2023: Use nodeBase() instead.")
ItemInternal* internalNode(Int32 index) const { return _connectivity()->_nodeV2(m_local_id,index); }
ARCANE_DEPRECATED_REASON("Y2023: Use edgeBase() instead.")
Expand Down Expand Up @@ -1132,13 +1076,10 @@ class ARCANE_CORE_EXPORT ItemInternal
shared_infos->_setTypeId(m_local_id,type_id.typeId());
}

ItemInternal* _internalNode(Int32 index) const { return _connectivity()->_nodeV2(m_local_id,index); }
ItemInternal* _internalEdge(Int32 index) const { return _connectivity()->_edgeV2(m_local_id,index); }
ItemInternal* _internalFace(Int32 index) const { return _connectivity()->_faceV2(m_local_id,index); }
ItemInternal* _internalCell(Int32 index) const { return _connectivity()->_cellV2(m_local_id,index); }
ItemInternal* _internalHParent(Int32 index) const { return _connectivity()->_hParentV2(m_local_id,index); }
ItemInternal* _internalHChild(Int32 index) const { return _connectivity()->_hChildV2(m_local_id,index); }
ItemInternal* _parent(Integer index) const { return m_shared_info->_parentV2(m_local_id,index); }
ItemInternal* _internalFace(Int32 index) const { return _connectivity()->_faceV2(m_local_id, index); }
ItemInternal* _internalCell(Int32 index) const { return _connectivity()->_cellV2(m_local_id, index); }
ItemInternal* _internalHParent(Int32 index) const { return _connectivity()->_hParentV2(m_local_id, index); }
ItemInternal* _internalHChild(Int32 index) const { return _connectivity()->_hChildV2(m_local_id, index); }
};

/*---------------------------------------------------------------------------*/
Expand Down

0 comments on commit 428c7f8

Please sign in to comment.