cleanup

Makefile.am

@@ -9,10 +9,10 @@ libmrutil_la_SOURCES = \
   libsharp2/sharp_almhelpers.cc \
   libsharp2/sharp_core.cc \
   libsharp2/sharp_geomhelpers.cc \
-  libsharp2/sharp_ylmgen_c.cc \
+  libsharp2/sharp_ylmgen.cc \
   libsharp2/sharp_internal.h \
   libsharp2/sharp_vecsupport.h \
-  libsharp2/sharp_ylmgen_c.h \
+  libsharp2/sharp_ylmgen.h \
   mr_util/cmplx.h \
   mr_util/error_handling.cc \
   mr_util/error_handling.h \

libsharp2/sharp.cc

@@ -29,7 +29,7 @@
 #include <cstring>
 #include <atomic>
 #include "mr_util/fft.h"
-#include "libsharp2/sharp_ylmgen_c.h"
+#include "libsharp2/sharp_ylmgen.h"
 #include "libsharp2/sharp_internal.h"
 #include "libsharp2/sharp_utils.h"
 #include "libsharp2/sharp_almhelpers.h"

libsharp2/sharp.h

@@ -30,10 +30,6 @@
 
 #include <stddef.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*! \internal
     Helper type containing information about a single ring. */
 typedef struct
@@ -257,8 +253,4 @@ int sharp_get_mlim (int lmax, int spin, double sth, double cth);
 int sharp_veclen(void);
 const char *sharp_architecture(void);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

libsharp2/sharp_almhelpers.h

@@ -30,10 +30,6 @@
 
 #include "libsharp2/sharp.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*! Initialises an a_lm data structure according to the scheme used by
     Healpix_cxx.
     \ingroup almgroup */
@@ -54,8 +50,4 @@ void sharp_make_rectangular_alm_info (int lmax, int mmax, int stride,
 void sharp_make_mmajor_real_packed_alm_info (int lmax, int stride,
   int nm, const int *ms, sharp_alm_info **alm_info);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

libsharp2/sharp_geomhelpers.h

@@ -30,10 +30,6 @@
 
 #include "libsharp2/sharp.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*! Creates a geometry information describing a HEALPix map with an
     Nside parameter \a nside. \a weight contains the relative ring
     weights and must have \a 2*nside entries. The rings array contains
@@ -142,8 +138,4 @@ void sharp_make_fejer2_geom_info (int nrings, int ppring, double phi0,
 void sharp_make_mw_geom_info (int nrings, int ppring, double phi0,
   int stride_lon, int stride_lat, sharp_geom_info **geom_info);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

libsharp2/sharp_internal.h

@@ -30,7 +30,7 @@
 
 #include <complex>
 #include "libsharp2/sharp.h"
-#include "libsharp2/sharp_ylmgen_c.h"
+#include "libsharp2/sharp_ylmgen.h"
 
 using std::complex;
 

libsharp2/sharp_utils.h

@@ -33,10 +33,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void *sharp_malloc_ (size_t sz);
 void sharp_free_ (void *ptr);
 
@@ -88,8 +84,4 @@ void sharp_free_ (void *ptr);
 #define SWAP(a,b,type) \
   do { type tmp_=(a); (a)=(b); (b)=tmp_; } while(0)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

libsharp2/sharp_ylmgen_c.cc → libsharp2/sharp_ylmgen.cc

@@ -27,7 +27,7 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include "libsharp2/sharp_ylmgen_c.h"
+#include "libsharp2/sharp_ylmgen.h"
 #include "libsharp2/sharp_utils.h"
 #include "mr_util/error_handling.h"
 

libsharp2/sharp_ylmgen_c.h → libsharp2/sharp_ylmgen.h

@@ -18,19 +18,15 @@
 
 /* libsharp2 is being developed at the Max-Planck-Institut fuer Astrophysik */
 
-/*! \file sharp_ylmgen_c.h
+/*! \file sharp_ylmgen.h
  *  Code for efficient calculation of Y_lm(phi=0,theta)
  *
  *  Copyright (C) 2005-2019 Max-Planck-Society
  *  \author Martin Reinecke
  */
 
-#ifndef SHARP2_YLMGEN_C_H
-#define SHARP2_YLMGEN_C_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef SHARP2_YLMGEN_H
+#define SHARP2_YLMGEN_H
 
 enum { sharp_minscale=0, sharp_limscale=1, sharp_maxscale=1 };
 static const double sharp_fbig=0x1p+800,sharp_fsmall=0x1p-800;
@@ -90,8 +86,4 @@ double *sharp_Ylmgen_get_norm (int lmax, int spin);
     user. */
 double *sharp_Ylmgen_get_d1norm (int lmax);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif