Use built-in Mille writer instead of wrapping C++ version

3 files changed, 2 insertions, 83 deletions

diff --git a/subprojects/packagefiles/millepede/meson.build b/subprojects/packagefiles/millepede/meson.build
index 603c709e..2857205f 100644
--- a/subprojects/packagefiles/millepede/meson.build
+++ b/subprojects/packagefiles/millepede/meson.build
@@ -1,5 +1,5 @@
 # Meson file for Millepede-II
-project('millepede', ['c', 'cpp','fortran'],
+project('millepede', ['c', 'fortran'],
         version: '2.0.0',
         license: 'LGPL2+',
         default_options: ['buildtype=debugoptimized'])
@@ -11,11 +11,7 @@ if zlibdep.found()
   pede_c_args += '-DUSE_ZLIB'
 endif
 
-mille = library('mille', ['Mille.cc', 'mille_c_wrap.cc'],
-                install: true)
-
-millepede_dep = declare_dependency(include_directories: '.',
-                                   link_with: mille)
+millepede_dep = declare_dependency()
 
 executable('pede',
            ['mpdef.f90',
diff --git a/subprojects/packagefiles/millepede/mille_c_wrap.cc b/subprojects/packagefiles/millepede/mille_c_wrap.cc
deleted file mode 100644
index 103754a1..00000000
--- a/subprojects/packagefiles/millepede/mille_c_wrap.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "Mille.h"
-#include "mille_c_wrap.h"
-
-
-extern "C" Mille *mille_new(const char *outFileName,
-                            int asBinary,
-                            int writeZero)
-{
-	return new Mille(outFileName, asBinary, writeZero);
-}
-
-
-extern "C" void mille_free(Mille *m)
-{
-	delete m;
-}
-
-
-extern "C" void mille_add_measurement(Mille *m,
-                                      int NLC, const float *derLc,
-                                      int NGL, const  float *derGl,
-                                      const int *label, float rMeas,
-                                      float sigma)
-{
-	m->mille(NLC, derLc, NGL, derGl, label, rMeas, sigma);
-}
-
-
-extern "C" void mille_add_special(Mille *m,
-                                  int nSpecial,
-                                  const float *floatings,
-                                  const int *integers)
-{
-	m->special(nSpecial, floatings, integers);
-}
-
-
-extern "C" void mille_delete_last_record(Mille *m)
-{
-	m->kill();
-}
-
-
-extern "C" void mille_write_record(Mille *m)
-{
-	m->end();
-}
diff --git a/subprojects/packagefiles/millepede/mille_c_wrap.h b/subprojects/packagefiles/millepede/mille_c_wrap.h
deleted file mode 100644
index 1f0fc841..00000000
--- a/subprojects/packagefiles/millepede/mille_c_wrap.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#else
-typedef void *Mille;
-#endif
-
-
-extern Mille *mille_new(const char *outFileName,
-                        int asBinary,
-                        int writeZero);
-
-extern void mille_add_measurement(Mille *m,
-                                  int NLC, const float *derLc,
-                                  int NGL, const  float *derGl,
-                                  const int *label, float rMeas, float sigma);
-
-extern void mille_add_special(Mille *m,
-                              int nSpecial,
-                              const float *floatings,
-                              const int *integers);
-
-extern void mille_delete_last_record(Mille *m);
-
-extern void mille_write_record(Mille *m);
-
-extern void mille_free(Mille *m);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif