Commit 1d85035a authored by Berrill, Mark's avatar Berrill, Mark
Browse files

Fixing compile errors with C++98

parent 076c10d1

src/RayTraceImage.cpp

+0 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ 
#include "ProfilerApp.h"



// AtomicModel includes

#ifndef USE_OPENACC

#include "interp.h"

#endif

#ifndef DISABLE_WRITE_FAILED_RAYS

#include "file_utilities.h"

#endif

src/interp.cpp

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ double interp::bisection_coeff( 
    // Finished

    delete[] x;

    delete[] r;

    if ( range_out != nullptr ) {

    if ( range_out != NULL ) {

        range_out[0] = range[0];

        range_out[1] = range[1];

    }

src/interp.h

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ double bisection( std::function<double( double, Args... )>, double lb, double ub 
 * @param[out] range    Optional output with the current bounds that contain the solution [lb ub]

 * @return              The next guess to use

 */

double bisection_coeff( size_t N, const double *x, const double *r, double *range = nullptr );

double bisection_coeff( size_t N, const double *x, const double *r, double *range = NULL );

}



#include "interp.hpp"