Skip to content
This repository has been archived by the owner on Sep 28, 2023. It is now read-only.

Commit

Permalink
Removes symbolic expression from default scalars.
Browse files Browse the repository at this point in the history
Signed-off-by: Agustin Alba Chicar <ag.albachicar@gmail.com>
  • Loading branch information
agalbachicar committed Sep 11, 2023
1 parent 78f9fe9 commit c4c2868
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
9 changes: 2 additions & 7 deletions include/maliput/drake/common/default_scalars.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once

#include "maliput/drake/common/autodiff.h"
#include "maliput/drake/common/symbolic.h"

// N.B. `CommonScalarPack` and `NonSymbolicScalarPack` in `systems_pybind.h`
// should be kept in sync with this file.
Expand Down Expand Up @@ -77,8 +75,7 @@
/// This should only be used in .cc files, never in .h files.
#define DRAKE_DEFINE_CLASS_TEMPLATE_INSTANTIATIONS_ON_DEFAULT_SCALARS( \
SomeType) \
template SomeType<double>; \
template SomeType<::maliput::drake::symbolic::Expression>;
template SomeType<double>;

/// Defines template instantiations for Drake's default nonsymbolic scalars.
/// This should only be used in .cc files, never in .h files.
Expand All @@ -92,7 +89,6 @@ template SomeType<double>;
#define DRAKE_DECLARE_CLASS_TEMPLATE_INSTANTIATIONS_ON_DEFAULT_SCALARS( \
SomeType) \
extern template SomeType<double>; \
extern template SomeType<::maliput::drake::symbolic::Expression>;

/// Declares that template instantiations exist for Drake's default nonsymbolic
/// scalars. This should only be used in .h files, never in .cc files.
Expand Down Expand Up @@ -198,8 +194,7 @@ constexpr auto Make_Function_Pointers_Pack1() { \
} \
static constexpr auto Function_Femplates __attribute__((used)) = \
Make_Function_Pointers_Pack1< \
double, \
::maliput::drake::symbolic::Expression>();
double>();

/// Defines template instantiations for Drake's default nonsymbolic scalars.
/// This should only be used in .cc files, never in .h files.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <Eigen/Core>

#include "maliput/drake/common/default_scalars.h"
#include "maliput/drake/common/drake_bool.h"
#include "maliput/drake/common/trajectories/trajectory.h"

namespace maliput::drake {
Expand Down
1 change: 1 addition & 0 deletions include/maliput/drake/math/roll_pitch_yaw.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "maliput/drake/common/default_scalars.h"
#include "maliput/drake/common/drake_assert.h"
#include "maliput/drake/common/drake_bool.h"
#include "maliput/drake/common/drake_copyable.h"
#include "maliput/drake/common/eigen_types.h"

Expand Down
1 change: 1 addition & 0 deletions include/maliput/drake/systems/framework/system_visitor.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include "maliput/drake/common/default_scalars.h"
#include "maliput/drake/common/drake_copyable.h"

namespace maliput::drake {
namespace systems {
Expand Down

0 comments on commit c4c2868

Please sign in to comment.