Commit 17fb7512 authored by Adam Mercer's avatar Adam Mercer

Merge branch 'fix-conda-warnings' into 'master'

Fix conda warnings

See merge request lscsoft/lalsuite!930
parents 6e4e98a7 041c5e90
Pipeline #75718 passed with stages
in 161 minutes and 25 seconds
......@@ -460,10 +460,6 @@ nightly:gcc:9:
# FIXME: currently using --disable-doxygen as documentation currently
# fails to build under Conda
# FIXME: currently using --disable-gcc-flags as there are various
# compilation errors when using the strict GCC flags and the Conda
# compiler
# FIXME: there currently seems to be an issue with performing FFTs using
# the MKL libraries, disable the use of MKL until this is understood
# https://git.ligo.org/lscsoft/lalsuite/issues/161
......@@ -496,7 +492,7 @@ nightly:gcc:9:
script:
# build lalsuite
- ./00boot
- ./configure --disable-doxygen --disable-gcc-flags
- ./configure --disable-doxygen
- make -j4 distcheck
only:
- schedules
......
......@@ -92,10 +92,10 @@ void REPORTSTATUS(LALStatus * status);
#ifdef NDEBUG
#define LALError( statusptr, statement ) 0
#define LALWarning( statusptr, warning ) 0
#define LALInfo( statusptr, info ) 0
#define LALTrace( statusptr, exitflg ) 0
#define LALError( statusptr, statement ) (void)(0)
#define LALWarning( statusptr, warning ) (void)(0)
#define LALInfo( statusptr, info ) (void)(0)
#define LALTrace( statusptr, exitflg ) (void)(0)
#else
......
......@@ -27,6 +27,11 @@ LALStatus *lalGSLGlobalStatusPtr = NULL;
pthread_mutex_t lalGSLPthreadMutex = PTHREAD_MUTEX_INITIALIZER;
#endif
#if __GNUC__
#define UNUSED __attribute__((unused))
#else
#define UNUSED
#endif
/**
* \ingroup LALGSL_h
......@@ -62,7 +67,7 @@ pthread_mutex_t lalGSLPthreadMutex = PTHREAD_MUTEX_INITIALIZER;
* with the LAL GSL error handler in effect.
*/
void
LALGSLErrorHandler(const char *reason,
LALGSLErrorHandler(UNUSED const char *reason,
const char *file, int line, int my_gsl_error)
{
if (!lalGSLGlobalStatusPtr) {
......
......@@ -26,6 +26,12 @@
#include <lal/BandPassTimeSeries.h>
#include <lal/ResampleTimeSeries.h>
#if __GNUC__
#define UNUSED __attribute__((unused))
#else
#define UNUSED
#endif
/**
* \defgroup ResampleTimeSeries_c Module ResampleTimeSeries.c
* \ingroup ResampleTimeSeries_h
......@@ -246,7 +252,7 @@ LALResampleREAL4TimeSeries(
/* order parameter n = 10. The order of the filter is 2 * n * resampRatio */
/* UINT4 ldasFilterOrderParameter = 10; */
UINT4 ldasByTwoOrder = 40;
CHAR ldasByTwoMsg[] =
UNUSED CHAR ldasByTwoMsg[] =
"LDAS FIR filter generated by firlp(0.5,40) using LDAS-CIT 0.7.0";
REAL8 ldasByTwo[] =
{
......@@ -266,7 +272,7 @@ LALResampleREAL4TimeSeries(
-1.0514587726686521e-03, -7.1587345178999983e-19
};
UINT4 ldasByFourOrder = 80;
CHAR ldasByFourMsg[] =
UNUSED CHAR ldasByFourMsg[] =
"LDAS FIR filter generated by firlp(0.25,80) using LDAS-CIT 0.7.0";
REAL8 ldasByFour[] =
{
......@@ -299,7 +305,7 @@ LALResampleREAL4TimeSeries(
-5.2579196542625766e-04, -2.8264939479410322e-04, -3.5797933214045194e-19
};
UINT4 ldasByEightOrder = 160;
CHAR ldasByEightMsg[] =
UNUSED CHAR ldasByEightMsg[] =
"LDAS FIR filter generated by firlp(0.125,160) using LDAS-CIT 0.7.0";
REAL8 ldasByEight[] =
{
......
......@@ -160,7 +160,7 @@ static int NRHybSur_LoadDataPiece(
// Load fit data for each empirical time node
const size_t str_size = 20;
char *node_name = XLALMalloc(str_size);
size_t nwritten;
UNUSED size_t nwritten;
for (int i=0; i<n_nodes; i++) {
nwritten = snprintf(node_name, str_size, "node_num_%d", i);
......@@ -284,7 +284,7 @@ static int NRHybSur_LoadSingleModeData(
const size_t str_size = 20;
char *sub_grp_name = XLALMalloc(str_size);
size_t nwritten;
UNUSED size_t nwritten;
if (ell == 2 && m ==2){
// Amplitude of 22 mode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment