Skip to content

Commit e1ef738

Browse files
grospelliergillesgrospelliergilles
authored
Merge pull request #1777 from arcaneframework/dev/gg-fix-some-compiler-warnings-in-arcane
Fix some compiler warnings
2 parents e4735e5 + f73ee03 commit e1ef738

File tree

7 files changed

+41
-64
lines changed

7 files changed

+41
-64
lines changed

‎arcane/src/arcane/core/Dom.h

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* Dom.h (C) 2000-2018 */
8+
/* Dom.h (C) 2000-2024 */
99
/* */
1010
/* Implémentation d'un DOM1+DOM2+DOM3(core). */
1111
/*---------------------------------------------------------------------------*/
@@ -20,13 +20,14 @@
2020
/*---------------------------------------------------------------------------*/
2121
/*---------------------------------------------------------------------------*/
2222

23-
ARCANE_BEGIN_NAMESPACE
23+
namespace Arcane
24+
{
2425
class IStringImpl;
2526
class IXmlDocumentHolder;
26-
ARCANE_END_NAMESPACE
27+
}
2728

28-
ARCANE_BEGIN_NAMESPACE
29-
ARCANE_BEGIN_NAMESPACE_DOM
29+
namespace Arcane::dom
30+
{
3031

3132
/*---------------------------------------------------------------------------*/
3233
/*---------------------------------------------------------------------------*/
@@ -642,10 +643,8 @@ class ARCANE_CORE_EXPORT Attr
642643
friend class IDOM_Node;
643644
friend class Element;
644645
public:
645-
Attr();
646+
Attr() = default;
646647
Attr(const Node&);
647-
Attr(const Attr&);
648-
~Attr();
649648
Attr(AttrPrv*);
650649
private:
651650
AttrPrv* _impl() const;
@@ -1244,8 +1243,7 @@ class XPathNamespace
12441243
/*---------------------------------------------------------------------------*/
12451244
/*---------------------------------------------------------------------------*/
12461245

1247-
ARCANE_END_NAMESPACE_DOM
1248-
ARCANE_END_NAMESPACE
1246+
}
12491247

12501248
/*---------------------------------------------------------------------------*/
12511249
/*---------------------------------------------------------------------------*/

‎arcane/src/arcane/core/DomLibXml2V2.cc

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,21 +1555,12 @@ replaceData(ULong offset,ULong count,const DOMString& arg) const
15551555
/*---------------------------------------------------------------------------*/
15561556
/*---------------------------------------------------------------------------*/
15571557

1558-
Attr::
1559-
Attr()
1560-
: Node()
1561-
{
1562-
}
15631558
Attr::
15641559
Attr(AttrPrv* p)
15651560
: Node(cvt((xmlNodePtr)impl(p)))
15661561
{
15671562
}
1568-
Attr::
1569-
Attr(const Attr& f)
1570-
: Node((const Node&)f)
1571-
{
1572-
}
1563+
15731564
Attr::
15741565
Attr(const Node& node)
15751566
: Node()
@@ -1580,10 +1571,7 @@ Attr(const Node& node)
15801571
//if (ni && impl(ni)->getNodeType()==ATTRIBUTE_NODE)
15811572
//_assign(node);
15821573
}
1583-
Attr::
1584-
~Attr()
1585-
{
1586-
}
1574+
15871575
AttrPrv* Attr::
15881576
_impl() const
15891577
{

‎arcane/src/arcane/core/MeshUtils.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ writeMeshConnectivity(IMesh* mesh, const String& file_name)
938938
{
939939
ofile << "<child count='" << cell.nbHChildren() << "'>";
940940
for (Integer j = 0; j < cell.nbHChildren(); ++j) {
941-
ofile << ' ' << cell.hChild(j)->uniqueId();
941+
ofile << ' ' << cell.hChild(j).uniqueId();
942942
}
943943
ofile << "</child>";
944944
}

‎arcane/src/arcane/hdf5/Hdf5Utils.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
22
//-----------------------------------------------------------------------------
3-
// Copyright 2000-2023 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
3+
// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
44
// See the top-level COPYRIGHT file for details.
55
// SPDX-License-Identifier: Apache-2.0
66
//-----------------------------------------------------------------------------
77
/*---------------------------------------------------------------------------*/
8-
/* Hdf5Utils.h (C) 2000-2023 */
8+
/* Hdf5Utils.h (C) 2000-2024 */
99
/* */
1010
/* Fonctions utilitaires pour hdf5. */
1111
/*---------------------------------------------------------------------------*/
@@ -577,8 +577,7 @@ class ARCANE_HDF5_EXPORT StandardTypes
577577

578578
~StandardTypes();
579579

580-
ARCANE_DEPRECATED_REASON("Y2023: Copy operator is deprecated. This class has unique ownership")
581-
StandardTypes& operator=(const StandardTypes& rhs) = default;
580+
StandardTypes& operator=(const StandardTypes& rhs) = delete;
582581

583582
public:
584583

‎arcane/src/arcane/impl/VariableSynchronizer.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@ class VariableSynchronizer::SyncMessage
9393

9494
SyncMessage(const DataSynchronizeDispatcherBuildInfo& bi, VariableSynchronizer* var_syncer,
9595
IMemoryAllocator* allocator)
96-
: m_variable_synchronizer(var_syncer)
97-
, m_variable_synchronizer_mng(var_syncer->synchronizeMng())
96+
: m_variable_synchronizer_mng(var_syncer->synchronizeMng())
9897
, m_dispatcher(IDataSynchronizeDispatcher::create(bi))
9998
, m_multi_dispatcher(IDataSynchronizeMultiDispatcher::create(bi))
10099
, m_event_args(var_syncer)
@@ -167,7 +166,6 @@ class VariableSynchronizer::SyncMessage
167166

168167
private:
169168

170-
IVariableSynchronizer* m_variable_synchronizer = nullptr;
171169
IVariableSynchronizerMng* m_variable_synchronizer_mng = nullptr;
172170
Ref<IDataSynchronizeDispatcher> m_dispatcher;
173171
IDataSynchronizeMultiDispatcher* m_multi_dispatcher = nullptr;

‎arcane/src/arcane/std/MeshPartitionerBase.h

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,27 @@
99
/* */
1010
/* Classe de base d'un partitionneur de maillage. */
1111
/*---------------------------------------------------------------------------*/
12-
#ifndef ARCANE_MESHPARTITIONERBASE_H
13-
#define ARCANE_MESHPARTITIONERBASE_H
12+
#ifndef ARCANE_STD_MESHPARTITIONERBASE_H
13+
#define ARCANE_STD_MESHPARTITIONERBASE_H
1414
/*---------------------------------------------------------------------------*/
1515
/*---------------------------------------------------------------------------*/
1616

17-
#include <set>
17+
#include "arcane/utils/Array.h"
18+
#include "arcane/utils/HashTableMap.h"
19+
#include "arcane/utils/ScopedPtr.h"
1820

1921
#include "arcane/core/IMeshPartitioner.h"
2022
#include "arcane/core/AbstractService.h"
2123
#include "arcane/core/ILoadBalanceMng.h"
2224

23-
#include "arcane/utils/Array.h"
24-
#include "arcane/utils/HashTableMap.h"
25-
#include "arcane/utils/ScopedPtr.h"
25+
#include <set>
2626

2727
/*---------------------------------------------------------------------------*/
2828
/*---------------------------------------------------------------------------*/
2929

3030
namespace Arcane
3131
{
3232

33-
/*---------------------------------------------------------------------------*/
34-
/*---------------------------------------------------------------------------*/
35-
36-
class ISubDomain;
37-
38-
3933
/*---------------------------------------------------------------------------*/
4034
/*---------------------------------------------------------------------------*/
4135
/*!
@@ -54,33 +48,33 @@ class ARCANE_STD_EXPORT MeshPartitionerBase
5448
public:
5549

5650
ISubDomain* subDomain() const { return m_sub_domain; }
57-
IMesh* mesh() const { return m_mesh; }
51+
IMesh* mesh() const override { return m_mesh; }
5852

5953
// DEPRECATED
6054
void setMaximumComputationTime(Real v) override { m_maximum_computation_time = v; }
61-
virtual Real maximumComputationTime() const { return m_maximum_computation_time; }
55+
Real maximumComputationTime() const override { return m_maximum_computation_time; }
6256

63-
virtual void setImbalance(Real v){ m_imbalance = v; }
64-
virtual Real imbalance() const { return m_imbalance; }
57+
void setImbalance(Real v) override { m_imbalance = v; }
58+
Real imbalance() const override { return m_imbalance; }
6559

66-
virtual void setMaxImbalance(Real v){ m_max_imbalance = v; }
67-
virtual Real maxImbalance() const { return m_max_imbalance; }
60+
void setMaxImbalance(Real v) override { m_max_imbalance = v; }
61+
Real maxImbalance() const override { return m_max_imbalance; }
6862

69-
virtual void setComputationTimes(RealConstArrayView v) { m_computation_times.copy(v); }
70-
virtual RealConstArrayView computationTimes() const { return m_computation_times; }
63+
void setComputationTimes(RealConstArrayView v) override { m_computation_times.copy(v); }
64+
RealConstArrayView computationTimes() const override { return m_computation_times; }
7165

72-
virtual void setCellsWeight(ArrayView<float> weights,Integer nb_weight);
73-
virtual ArrayView<float> cellsWeight() const;
66+
void setCellsWeight(ArrayView<float> weights,Integer nb_weight) override;
67+
ArrayView<float> cellsWeight() const override;
7468

7569
// CORRECT
76-
virtual Integer nbCellWeight() const;
77-
virtual void setILoadBalanceMng(ILoadBalanceMng* mng) { m_lbMng = mng; }
78-
virtual ILoadBalanceMng* loadBalanceMng() const { return m_lbMng; }
70+
Integer nbCellWeight() const;
71+
void setILoadBalanceMng(ILoadBalanceMng* mng) override { m_lbMng = mng; }
72+
ILoadBalanceMng* loadBalanceMng() const override { return m_lbMng; }
7973

8074

8175
public:
8276

83-
virtual void notifyEndPartition() { loadBalanceMng()->notifyEndPartition(); }
77+
void notifyEndPartition() override { loadBalanceMng()->notifyEndPartition(); }
8478

8579
public:
8680

@@ -152,11 +146,10 @@ class ARCANE_STD_EXPORT MeshPartitionerBase
152146

153147
virtual void* getCommunicator() const;
154148
virtual Parallel::Communicator communicator() const;
155-
156-
157149
virtual bool cellComm() {return true; }
158150

159-
protected:
151+
protected:
152+
160153
virtual void _initArrayCellsWithConstraints();
161154
virtual void _initFilterLidCells();
162155
virtual void _initUidRef();
@@ -166,6 +159,7 @@ class ARCANE_STD_EXPORT MeshPartitionerBase
166159
virtual void _clearCellWgt();
167160

168161
private:
162+
169163
Real _addNgb(const Cell& cell, const Face& face, Int64Array& neighbourcells, Array<bool>& contrib,
170164
HashTableMapT<Int64,Int32>& map, Array<float> *ptrcommWeights, Int32 offset,
171165
HashTableMapT<Int32,Int32>& lids, bool special=false);

‎arcane/src/arcane/utils/HashTableMap2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ template <typename KeyT, typename ValueT,
165165
class HashTableMap2
166166
: public HashTableMap2Base
167167
{
168-
constexpr static double EMH_DEFAULT_LOAD_FACTOR = 0.80f;
169-
constexpr static double EMH_MIN_LOAD_FACTOR = 0.25f; //< 0.5
168+
constexpr static float EMH_DEFAULT_LOAD_FACTOR = 0.80f;
169+
constexpr static float EMH_MIN_LOAD_FACTOR = 0.25f; //< 0.5
170170
constexpr static uint32_t EMH_CACHE_LINE_SIZE = 64; //debug only
171171

172172
public:

0 commit comments

Comments
 (0)