Merge pull request #209 from ecmwf/feature/modernisation-inheritance

Feature/modernisation_inheritance

.gitignore

@@ -17,6 +17,8 @@ grib_api.pc
 grib_api_f90.pc
 *.analyzerinfo
 *.snalyzerinfo
+tags
+src/convert_*.sh
 
 # compiled source #
 ###################
@@ -72,3 +74,4 @@ data/bufr/*test
 
 build/
 *.back
+trash

examples/C/grib_pthreads.c

@@ -9,11 +9,22 @@
  */
 
 #include <pthread.h>
-#include "grib_api_internal.h"
+#include <stdio.h>
+#include <stdlib.h>
+/*#include "grib_api_internal.h"*/
 
 #include "eccodes.h"
 #define NUM_THREADS 4
 
+void Assert(int condition)
+{
+ if (!condition) {
+ printf("Assertion failed\n");
+ exit(1);
+ }
+}
+
+
 /* Return 0 if numbers considered equal, otherwise 1 */
 static int compare_doubles(double a, double b, double tolerance)
 {
@@ -40,7 +51,7 @@ static void* process_grib(void* threadID)
  ProductKind prod_kind = 0;
 
  codes_handle* h = codes_grib_handle_new_from_samples(0, "regular_ll_pl_grib2");
- Assert(h);
+ Assert(h != NULL);
  CODES_CHECK(codes_get_product_kind(h, &prod_kind), 0);
  Assert(prod_kind == PRODUCT_GRIB);
  printf("Thread %ld running\n", tid);

fortran/CMakeLists.txt

@@ -42,7 +42,7 @@ if( HAVE_FORTRAN )
  # Note: $<BUILD_INTERFACE:...> will be present only while building (for the whole bundle),
  # whereas $<INSTALL_INTERFACE:...> is only present once you install the package / bundle
  ecbuild_add_library( TARGET eccodes_f90
- SOURCES grib_fortran.c grib_f90.f90 eccodes_f90.f90 grib_kinds.h
+ SOURCES grib_fortran.cc grib_f90.f90 eccodes_f90.f90 grib_kinds.h
  GENERATED grib_f90.f90 eccodes_f90.f90
  PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
  $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}>

fortran/grib_fortran.c → fortran/grib_fortran.cc

@@ -9,6 +9,7 @@
  */
 
 #include "grib_api_internal.h"
+#include "grib_fortran_prototypes.h"
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>