ECC-1996: Fix compiler warnings and thread test

ecmwf · Dec 18, 2024 · f209000 · f209000
1 parent 546c166
commit f209000
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 16 deletions.
diff --git a/src/dumper/grib_dumper.h b/src/dumper/grib_dumper.h
@@ -46,9 +46,9 @@ class Dumper
     long count_             = 0;
 
 private:
-    const char* name_ = nullptr;
-    size_t size_      = 0;
-    int inited_       = 0;
+    // const char* name_ = nullptr;
+    // size_t size_      = 0;
+    // int inited_       = 0;
 };
 
 }  // namespace eccodes
diff --git a/src/dumper/grib_dumper_class_bufr_decode_C.h b/src/dumper/grib_dumper_class_bufr_decode_C.h
@@ -43,7 +43,7 @@ class BufrDecodeC : public Dumper
 
     long section_offset_    = 0;
     long empty_             = 0;
-    long end_               = 0;
+    //long end_               = 0;
     long isLeaf_            = 0;
     long isAttribute_       = 0;
     grib_string_list* keys_ = nullptr;

diff --git a/src/dumper/grib_dumper_class_bufr_decode_filter.h b/src/dumper/grib_dumper_class_bufr_decode_filter.h
@@ -37,7 +37,7 @@ class BufrDecodeFilter : public Dumper
     long section_offset_    = 0;
     long begin_             = 0;
     long empty_             = 0;
-    long end_               = 0;
+    //long end_               = 0;
     long isLeaf_            = 0;
     long isAttribute_       = 0;
     grib_string_list* keys_ = nullptr;

diff --git a/src/dumper/grib_dumper_class_bufr_decode_fortran.h b/src/dumper/grib_dumper_class_bufr_decode_fortran.h
@@ -36,7 +36,7 @@ class BufrDecodeFortran : public Dumper
 private:
     long section_offset_    = 0;
     long empty_             = 0;
-    long end_               = 0;
+    // long end_               = 0;
     long isLeaf_            = 0;
     long isAttribute_       = 0;
     grib_string_list* keys_ = nullptr;

diff --git a/src/dumper/grib_dumper_class_bufr_decode_python.h b/src/dumper/grib_dumper_class_bufr_decode_python.h
@@ -38,7 +38,7 @@ class BufrDecodePython : public Dumper
 
     long section_offset_    = 0;
     long empty_             = 0;
-    long end_               = 0;
+    // long end_               = 0;
     long isLeaf_            = 0;
     long isAttribute_       = 0;
     grib_string_list* keys_ = nullptr;

diff --git a/src/dumper/grib_dumper_class_bufr_encode_C.h b/src/dumper/grib_dumper_class_bufr_encode_C.h
@@ -37,7 +37,7 @@ class BufrEncodeC : public Dumper
     static inline int depth_ = 0;
     long section_offset_     = 0;
     long empty_              = 0;
-    long end_                = 0;
+    //long end_                = 0;
     long isLeaf_             = 0;
     long isAttribute_        = 0;
     grib_string_list* keys_  = nullptr;

diff --git a/src/dumper/grib_dumper_class_bufr_encode_filter.h b/src/dumper/grib_dumper_class_bufr_encode_filter.h
@@ -37,7 +37,7 @@ class BufrEncodeFilter : public Dumper
     long section_offset_    = 0;
     long begin_             = 0;
     long empty_             = 0;
-    long end_               = 0;
+    //long end_               = 0;
     long isLeaf_            = 0;
     long isAttribute_       = 0;
     grib_string_list* keys_ = nullptr;

diff --git a/src/dumper/grib_dumper_class_bufr_encode_fortran.h b/src/dumper/grib_dumper_class_bufr_encode_fortran.h
@@ -41,7 +41,7 @@ class BufrEncodeFortran : public Dumper
 
     long section_offset_    = 0;
     long empty_             = 0;
-    long end_               = 0;
+    //long end_               = 0;
     long isLeaf_            = 0;
     long isAttribute_       = 0;
     grib_string_list* keys_ = nullptr;

diff --git a/src/dumper/grib_dumper_class_bufr_encode_python.h b/src/dumper/grib_dumper_class_bufr_encode_python.h
@@ -40,7 +40,7 @@ class BufrEncodePython : public Dumper
     static inline int depth_ = 0;
     long section_offset_     = 0;
     long empty_              = 0;
-    long end_                = 0;
+    //long end_                = 0;
     long isLeaf_             = 0;
     long isAttribute_        = 0;
     grib_string_list* keys_  = nullptr;

diff --git a/src/dumper/grib_dumper_class_bufr_simple.h b/src/dumper/grib_dumper_class_bufr_simple.h
@@ -34,7 +34,7 @@ class BufrSimple : public Dumper
 private:
     long section_offset_    = 0;
     long empty_             = 0;
-    long end_               = 0;
+    //long end_               = 0;
     long isLeaf_            = 0;
     long isAttribute_       = 0;
     long numberOfSubsets_   = 0;

diff --git a/src/dumper/grib_dumper_class_default.h b/src/dumper/grib_dumper_class_default.h
@@ -33,8 +33,8 @@ class Default : public Dumper
 
 private:
     long section_offset_ = 0;
-    long begin_          = 0;
-    long theEnd_         = 0;
+    //long begin_          = 0;
+    //long theEnd_         = 0;
 
     void aliases(grib_accessor* a);
     void print_offset(FILE* out, grib_accessor* a);

diff --git a/src/dumper/grib_dumper_class_grib_encode_C.h b/src/dumper/grib_dumper_class_grib_encode_C.h
@@ -34,7 +34,7 @@ class GribEncodeC : public Dumper
     void footer(const grib_handle*) override;
 
 private:
-    int cr_ = 0;
+    // int cr_ = 0;
 };
 
 }  // namespace eccodes::dumper
diff --git a/tests/bufr_encode_pthreads.cc b/tests/bufr_encode_pthreads.cc
@@ -16,6 +16,7 @@
 
 #include "eccodes.h"
 #include "grib_api_internal.h"
+#include "grib_dumper_factory.h"
 
 /* These are passed in via argv */
 static size_t NUM_THREADS         = 0;
@@ -64,7 +65,7 @@ static int encode_file(char* template_file, char* output_file)
         }
         if (opt_dump) {
             FILE* devnull            = fopen("/dev/null", "w");
-            grib_dumper* dumper      = NULL;
+            eccodes::Dumper* dumper  = NULL;
             const char* dumper_name  = "bufr_simple";
             unsigned long dump_flags = CODES_DUMP_FLAG_ALL_DATA;
             /* codes_dump_content(source_handle,devnull, "json", 1024, NULL); */ /* JSON dump with all attributes */