Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit c2c2ecd

Browse files
Resolved warnings during build and updated docs source
- Changed catching of runtime errors in code to by ref instead of by value in order to resolve warnings. https://stackoverflow.com/questions/62030341/what-is-this-catching-polymorphic-type-x-by-value-wcatch-value - Changed all occurences of `#include <boost/bind.hpp>` to `#include<boost/bind/bind.hpp>` with `using namespace boost::placeholders` to resolve boost warnings with new version of boost.
1 parent a7c7d5e commit c2c2ecd

File tree

103 files changed

+372
-155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+372
-155
lines changed

cmake_modules/compiler.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@
125125
" -Wall"
126126
" -Wextra"
127127
" -Wno-unused-parameter"
128-
" -Wno-unused-variable")
128+
" -Wno-unused-variable"
129+
)
129130
string(CONCAT CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
130131

131132
elseif (WIN32)

docs/doxygen/Doxyfile renamed to docs/doxygen/Doxyfile.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ PROJECT_BRIEF =
5151
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
5252
# the logo to the output directory.
5353

54-
PROJECT_LOGO =
54+
PROJECT_LOGO = ../img.png
5555

5656
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
5757
# into which the generated documentation will be written. If a relative path is
5858
# entered, it will be relative to the location where doxygen was started. If
5959
# left blank the current directory will be used.
6060

61-
OUTPUT_DIRECTORY =
61+
OUTPUT_DIRECTORY = @DOXYGEN_OUTPUT_DIRECTORY
6262

6363
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
6464
# directories (in 2 levels) under the output directory of each output format and
@@ -68,7 +68,7 @@ OUTPUT_DIRECTORY =
6868
# performance problems for the file system.
6969
# The default value is: NO.
7070

71-
CREATE_SUBDIRS = NO
71+
CREATE_SUBDIRS = YES
7272

7373
# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
7474
# characters to appear in the names of generated files. If set to NO, non-ASCII

docs/img.png

14.7 KB
Loading

docs/sphinx/source/conf.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@
3939
'sphinxcontrib.napoleon',
4040
'breathe',
4141
]
42+
import os
4243

4344
# Breathe
4445
breathe_default_project = "Tudat"
4546
breathe_projects = {}
46-
breathe_projects["Tudat"] = "../../doxygen/xml"
47+
breathe_projects["Tudat"] = os.path.join(os.environ.pop("DOXYGEN_OUTPUT_DIRECTORY", "../doxygen"), "xml")
4748

4849
# Add any paths that contain templates here, relative to this directory.
4950
templates_path = ['_templates']

include/tudat/astro/aerodynamics/controlSurfaceAerodynamicCoefficientInterface.h

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
#include <vector>
1515

1616
#include <functional>
17-
#include <boost/bind.hpp>
17+
#include <boost/bind/bind.hpp>
1818

1919
#include <Eigen/Core>
2020

2121
#include "tudat/basics/basicTypedefs.h"
2222
#include "tudat/astro/aerodynamics/aerodynamics.h"
23+
24+
using namespace boost::placeholders;
25+
2326
namespace tudat
2427
{
2528

include/tudat/astro/aerodynamics/customAerodynamicCoefficientInterface.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
1313

1414
#include <boost/lambda/lambda.hpp>
1515
#include <functional>
16-
#include <boost/bind.hpp>
16+
#include <boost/bind/bind.hpp>
1717
#include <boost/make_shared.hpp>
1818

1919
#include "tudat/astro/aerodynamics/aerodynamicCoefficientInterface.h"
2020
#include "tudat/astro/aerodynamics/aerodynamicCoefficientGenerator.h"
2121
#include "tudat/astro/aerodynamics/hypersonicLocalInclinationAnalysis.h"
2222
#include "tudat/basics/basicTypedefs.h"
2323

24+
using namespace boost::placeholders;
25+
2426
namespace tudat
2527
{
2628
namespace aerodynamics

include/tudat/astro/aerodynamics/customConstantTemperatureAtmosphere.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#ifndef TUDAT_CUSTOM_CONSTANT_TEMPERATURE_ATMOSPHERE_H
2121
#define TUDAT_CUSTOM_CONSTANT_TEMPERATURE_ATMOSPHERE_H
2222

23-
#include <boost/bind.hpp>
23+
#include <boost/bind/bind.hpp>
2424
#include <boost/function.hpp>
2525
#include <boost/shared_ptr.hpp>
2626

@@ -32,6 +32,8 @@
3232
#include "tudat/astro/aerodynamics/standardAtmosphere.h"
3333
#include "tudat/astro/basic_astro/physicalConstants.h"
3434

35+
using namespace boost::placeholders;
36+
3537
namespace tudat
3638
{
3739

include/tudat/astro/aerodynamics/flightConditions.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <vector>
1515

1616
#include <functional>
17-
#include <boost/bind.hpp>
17+
#include <boost/bind/bind.hpp>
1818

1919
#include "tudat/astro/aerodynamics/trimOrientation.h"
2020
#include "tudat/astro/aerodynamics/aerodynamicCoefficientInterface.h"
@@ -23,6 +23,8 @@
2323
#include "tudat/astro/reference_frames/aerodynamicAngleCalculator.h"
2424
#include "tudat/basics/basicTypedefs.h"
2525

26+
using namespace boost::placeholders;
27+
2628
namespace tudat
2729
{
2830

include/tudat/astro/basic_astro/convertMeanToEccentricAnomalies.h

+7-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#ifndef TUDAT_CONVERT_MEAN_ANOMALY_TO_ECCENTRIC_ANOMALY_H
3131
#define TUDAT_CONVERT_MEAN_ANOMALY_TO_ECCENTRIC_ANOMALY_H
3232

33-
#include <boost/bind.hpp>
33+
#include <boost/bind/bind.hpp>
3434
#include <memory>
3535
#include <boost/make_shared.hpp>
3636
#include <boost/math/special_functions/asinh.hpp>
@@ -42,6 +42,8 @@
4242
#include "tudat/math/basic/basicMathematicsFunctions.h"
4343
#include "tudat/math/basic/functionProxy.h"
4444

45+
using namespace boost::placeholders;
46+
4547
namespace tudat
4648
{
4749

@@ -236,7 +238,8 @@ ScalarType convertMeanAnomalyToEccentricAnomaly(
236238
eccentricAnomaly = rootFinder->execute( rootFunction, initialGuess );
237239
}
238240
// Use bisection algorithm if root finder fails
239-
catch( std::runtime_error )
241+
catch( std::runtime_error const& )
242+
240243
{
241244
// Set tolerance
242245
ScalarType tolerance = 10.0 * std::numeric_limits< ScalarType >::epsilon( );
@@ -389,7 +392,8 @@ ScalarType convertMeanAnomalyToHyperbolicEccentricAnomaly(
389392
hyperbolicEccentricAnomaly = rootFinder->execute( rootFunction, initialGuess );
390393

391394
}
392-
catch( std::runtime_error )
395+
catch( std::runtime_error const& )
396+
393397
{
394398
rootFinder = createRootFinder< ScalarType >(
395399
bisectionRootFinderSettings(

include/tudat/astro/earth_orientation/shortPeriodEarthOrientationCorrectionCalculator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <string>
1717

1818
#include <functional>
19-
#include <boost/bind.hpp>
19+
#include <boost/bind/bind.hpp>
2020
#include <boost/make_shared.hpp>
2121

2222
#include <Eigen/Core>
@@ -30,7 +30,7 @@
3030
#include "tudat/interface/sofa/fundamentalArguments.h"
3131
#include "tudat/io/basicInputOutput.h"
3232

33-
33+
using namespace boost::placeholders;
3434

3535
namespace tudat
3636
{

include/tudat/astro/electromagnetism/panelledRadiationPressure.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616

1717
#include <boost/function.hpp>
1818
#include <boost/lambda/lambda.hpp>
19-
#include <boost/bind.hpp>
19+
#include <boost/bind/bind.hpp>
2020
#include <boost/function.hpp>
2121

2222
#include <Eigen/Core>
2323

2424
#include "tudat/astro/basic_astro/accelerationModel.h"
2525
#include "tudat/astro/electromagnetism/radiationPressureInterface.h"
2626

27+
using namespace boost::placeholders;
28+
2729
namespace tudat
2830
{
2931

include/tudat/astro/ephemerides/compositeEphemeris.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <vector>
1515

16-
#include <boost/bind.hpp>
16+
#include <boost/bind/bind.hpp>
1717
#include <memory>
1818
#include <boost/make_shared.hpp>
1919

@@ -24,6 +24,7 @@
2424
#include "tudat/astro/ephemerides/rotationalEphemeris.h"
2525
#include "tudat/astro/ephemerides/constantEphemeris.h"
2626

27+
using namespace boost::placeholders;
2728

2829
namespace tudat
2930
{

include/tudat/astro/ephemerides/frameManager.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <vector>
1515

1616
#include <boost/make_shared.hpp>
17-
#include <boost/bind.hpp>
17+
#include <boost/bind/bind.hpp>
1818

1919
#include "tudat/math/basic/mathematicalConstants.h"
2020

@@ -23,6 +23,8 @@
2323
#include "tudat/astro/ephemerides/compositeEphemeris.h"
2424
#include "tudat/astro/ephemerides/constantEphemeris.h"
2525

26+
using namespace boost::placeholders;
27+
2628
namespace tudat
2729
{
2830

include/tudat/astro/ephemerides/itrsToGcrsRotationModel.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414

1515
#if TUDAT_BUILD_WITH_SOFA_INTERFACE
1616

17-
#include <boost/bind.hpp>
17+
#include <boost/bind/bind.hpp>
1818

1919
#include "tudat/math/basic/linearAlgebra.h"
2020
#include "tudat/math/interpolators/interpolator.h"
2121
#include "tudat/astro/ephemerides/rotationalEphemeris.h"
2222
#include "tudat/astro/earth_orientation/earthOrientationCalculator.h"
2323

24+
using namespace boost::placeholders;
25+
2426
namespace tudat
2527
{
2628

include/tudat/astro/gravitation/basicSolidBodyTideGravityFieldVariations.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <functional>
1515
#include <boost/multi_array.hpp>
16-
#include <boost/bind.hpp>
16+
#include <boost/bind/bind.hpp>
1717

1818
#include <Eigen/Core>
1919
#include <Eigen/Geometry>
@@ -27,6 +27,8 @@
2727
#include "tudat/math/basic/legendrePolynomials.h"
2828
#include "tudat/astro/gravitation/gravityFieldVariations.h"
2929

30+
using namespace boost::placeholders;
31+
3032
namespace tudat
3133
{
3234

include/tudat/astro/gravitation/mutualSphericalHarmonicGravityModel.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <functional>
1616
#include <boost/lambda/lambda.hpp>
1717
#include <memory>
18-
#include <boost/bind.hpp>
18+
#include <boost/bind/bind.hpp>
1919
#include <boost/make_shared.hpp>
2020

2121
#include <Eigen/Core>
@@ -27,6 +27,8 @@
2727
#include "tudat/math/basic/legendrePolynomials.h"
2828
#include "tudat/basics/basicTypedefs.h"
2929

30+
using namespace boost::placeholders;
31+
3032
namespace tudat
3133
{
3234

include/tudat/astro/ground_stations/pointingAnglesCalculator.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
1313
#define TUDAT_POINTINGANGLESCALCULATOR_H
1414

1515
#include <memory>
16-
#include <boost/bind.hpp>
16+
#include <boost/bind/bind.hpp>
1717

1818
#include <Eigen/Core>
1919
#include <Eigen/Geometry>
2020

2121
#include "tudat/astro/ephemerides/rotationalEphemeris.h"
2222
#include "tudat/astro/ground_stations/groundStationState.h"
2323

24+
using namespace boost::placeholders;
25+
2426
namespace tudat
2527
{
2628

include/tudat/astro/low_thrust/lowThrustLegSettings.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include <Eigen/Geometry>
2222

23-
#include <boost/bind.hpp>
23+
#include <boost/bind/bind.hpp>
2424
#include <functional>
2525

2626
#if( TUDAT_BUILD_WITH_PAGMO )
@@ -32,6 +32,7 @@
3232

3333
#include "tudat/astro/low_thrust/lowThrustLeg.h"
3434

35+
using namespace boost::placeholders;
3536

3637
namespace tudat
3738
{

include/tudat/astro/low_thrust/lowThrustOptimisationSetup.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include <Eigen/Geometry>
2222

23-
#include <boost/bind.hpp>
23+
#include <boost/bind/bind.hpp>
2424
#include <functional>
2525

2626
#include "tudat/astro/low_thrust/simsFlanagan.h"
@@ -32,6 +32,7 @@
3232
#include "pagmo/io.hpp"
3333
#include "pagmo/problem.hpp"
3434

35+
using namespace boost::placeholders;
3536

3637
namespace tudat
3738
{

include/tudat/astro/observation_models/observationModel.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <vector>
1515

16-
#include <boost/bind.hpp>
16+
#include <boost/bind/bind.hpp>
1717
#include <memory>
1818
#include <functional>
1919

@@ -27,6 +27,8 @@
2727
#include "tudat/astro/observation_models/observableTypes.h"
2828
#include "tudat/astro/observation_models/observationBias.h"
2929

30+
using namespace boost::placeholders;
31+
3032
namespace tudat
3133
{
3234

include/tudat/astro/observation_models/positionObservationModel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef TUDAT_POSITIONOBSERVATIONMODEL_H
1212
#define TUDAT_POSITIONOBSERVATIONMODEL_H
1313

14-
#include <boost/bind.hpp>
14+
#include <boost/bind/bind.hpp>
1515
#include <functional>
1616

1717
#include "tudat/astro/ephemerides/ephemeris.h"

include/tudat/astro/observation_models/simulateObservations.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
#define TUDAT_SIMULATEOBSERVATIONS_H
1313

1414
#include <memory>
15-
#include <boost/bind.hpp>
15+
#include <boost/bind/bind.hpp>
16+
using namespace boost::placeholders;
17+
1618

1719
#include "tudat/astro/observation_models/observationSimulator.h"
1820
#include "tudat/basics/utilities.h"

include/tudat/astro/observation_models/velocityObservationModel.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
#ifndef TUDAT_VELOCITYOBSERVATIONMODEL_H
1212
#define TUDAT_VELOCITYOBSERVATIONMODEL_H
1313

14-
#include <boost/bind.hpp>
14+
#include <boost/bind/bind.hpp>
15+
using namespace boost::placeholders;
16+
1517
#include <boost/function.hpp>
1618

1719
#include "tudat/astro/ephemerides/ephemeris.h"

include/tudat/astro/orbit_determination/acceleration_partials/accelerationPartial.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
#include <map>
1616
#include <Eigen/Core>
1717

18-
#include <boost/bind.hpp>
18+
#include <boost/bind/bind.hpp>
19+
using namespace boost::placeholders;
20+
1921

2022
#include "tudat/astro/basic_astro/accelerationModel.h"
2123

0 commit comments

Comments
 (0)