Skip to content

Commit 70478f0

Browse files
authored
Merge pull request OSGeo#13072 from AbelPau/MiraMonWeffc+Wold-style-cast
MiraMonVector: deactivating NO_CXX_WFLAGS_EFFCXX and NO_WFLAG_OLD_STYLE
2 parents 51c49a2 + 2c9be26 commit 70478f0

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

ogr/ogrsf_frmts/miramon/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ add_gdal_driver(
33
SOURCES ogrmiramondatasource.cpp ogrmiramondriver.cpp ogrmiramonlayer.cpp mm_wrlayr.c mm_rdlayr.c
44
PLUGIN_CAPABLE
55
NO_DEPS
6-
NO_CXX_WFLAGS_EFFCXX
7-
NO_WFLAG_OLD_STYLE_CAST
86
)
97
gdal_standard_includes(ogr_MiraMon)
108
target_include_directories(ogr_MiraMon PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)

ogr/ogrsf_frmts/miramon/ogrmiramon.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ class OGRMiraMonLayer final
2525
: public OGRLayer,
2626
public OGRGetNextFeatureThroughRaw<OGRMiraMonLayer>
2727
{
28+
OGRMiraMonLayer(const OGRMiraMonLayer &) = delete;
29+
OGRMiraMonLayer &operator=(const OGRMiraMonLayer &) = delete;
30+
2831
GDALDataset *m_poDS;
2932
OGRSpatialReference *m_poSRS;
3033
OGRFeatureDefn *m_poFeatureDefn;
@@ -51,8 +54,8 @@ class OGRMiraMonLayer final
5154
VSILFILE *m_fp = nullptr;
5255

5356
// Array of doubles used in the field features processing
54-
double *padfValues;
55-
GInt64 *pnInt64Values;
57+
double *padfValues = nullptr;
58+
GInt64 *pnInt64Values = nullptr;
5659

5760
OGRFeature *GetNextRawFeature();
5861
OGRFeature *GetFeature(GIntBig nFeatureId) override;
@@ -111,13 +114,16 @@ class OGRMiraMonLayer final
111114

112115
class OGRMiraMonDataSource final : public GDALDataset
113116
{
114-
std::vector<std::unique_ptr<OGRMiraMonLayer>> m_apoLayers;
117+
std::vector<std::unique_ptr<OGRMiraMonLayer>> m_apoLayers = {};
115118
std::string m_osRootName{};
116119
bool m_bUpdate = false;
117-
struct MiraMonVectMapInfo m_MMMap;
120+
struct MiraMonVectMapInfo m_MMMap = {};
118121

119122
public:
120123
OGRMiraMonDataSource();
124+
OGRMiraMonDataSource(const OGRMiraMonDataSource &) = delete;
125+
OGRMiraMonDataSource &operator=(const OGRMiraMonDataSource &) = delete;
126+
121127
~OGRMiraMonDataSource() override;
122128

123129
bool Open(const char *pszFilename, VSILFILE *fp,

0 commit comments

Comments
 (0)