Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit 22312619 authored by gsell's avatar gsell
Browse files

fixes for macOS 14.4 and Clang 15

parent 19c77a19
No related branches found
No related tags found
1 merge request!658Resolve "fixes/cleanup for compiling on macOS 14.4 and Clang 15 (Xcode 15.3)"
......@@ -99,6 +99,9 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
# is using this visibility setting.
add_compile_options (-fvisibility=hidden)
add_compile_options (-fvisibility-inlines-hidden)
add_compile_options (-Wno-deprecated-declarations)
add_compile_options (-Wno-deprecated-builtins)
add_compile_options (-Wno-deprecated-copy)
if (ENABLE_OpenMP)
if (CMAKE_HOST_APPLE)
message(FATAL_ERROR "Apple Clang does not support OpenMP!")
......
......@@ -100,13 +100,13 @@ namespace client { namespace ast
operand first;
std::list<operation> rest;
};
#if 0
// print functions for debugging
inline std::ostream& operator<<(std::ostream& out, nil)
{
out << "nil"; return out;
}
#endif
inline std::ostream& operator<<(std::ostream& out, identifier const& id)
{
out << id.name; return out;
......
......@@ -159,7 +159,7 @@ public:
virtual void getDimensions(double &zBegin, double &zEnd) const = 0;
virtual ElementType getType() const;
virtual ElementType getType() const override;
/// Return design element.
// If this method returns a pointer to this component.
......
......@@ -185,14 +185,14 @@ public:
double& t, Vector_t& R, Vector_t& P);
/** Returns empty field */
NullField& getField() {return nullfield_m;}
NullField& getField() override {return nullfield_m;}
/** Returns empty field */
const NullField& getField() const {return nullfield_m;}
const NullField& getField() const override {return nullfield_m;}
/** Returns empty geometry */
StraightGeometry& getGeometry() {return geom_m;}
StraightGeometry& getGeometry() override {return geom_m;}
/** Returns empty geometry */
const StraightGeometry& getGeometry() const {return geom_m;}
const StraightGeometry& getGeometry() const override {return geom_m;}
/** Make an RK4Step
* @li tstep: time step [s]
* @li chargeToMass: chargeToMass ratio [m^2/s^2/GV]
......@@ -209,13 +209,13 @@ public:
void operator=(const OutputPlane&) = delete;
//ElementBase::ElementType getType() const;
ElementType getType() const;
ElementType getType() const override;
void recentre(Vector_t R, Vector_t P);
private:
/// Initialise peakfinder file
virtual void doInitialise(PartBunchBase<double, 3>* /*bunch*/);
virtual void doInitialise(PartBunchBase<double, 3>* /*bunch*/) override;
/// Record probe hits when bunch particles pass
inline bool doPreCheck(PartBunchBase<double, 3> *bunch) override;
......
......@@ -27,16 +27,16 @@
class MockDipole : public Component {
public:
MockDipole(const std::string /*&name*/) : bfield_m(0, 1, 0), efield_m() {}
NullField &getField() {return nullfield_m;}
const NullField &getField() const {return nullfield_m;}
void accept(BeamlineVisitor& /*&visitor*/) const {}
void initialise(PartBunchBase<double, 3>* /*bunch*/, double& /*start*/, double& /*end*/) {}
void finalise() {}
bool bends() const {return true;}
void getDimensions(double& /*zBegin*/, double& /*zEnd*/) const {}
StraightGeometry& getGeometry() {return geom_m;}
const StraightGeometry& getGeometry() const {return geom_m;}
ElementBase* clone() const {return NULL;}
NullField &getField() override {return nullfield_m;}
const NullField &getField() const override {return nullfield_m;}
void accept(BeamlineVisitor& /*&visitor*/) const override {}
void initialise(PartBunchBase<double, 3>* /*bunch*/, double& /*start*/, double& /*end*/) override {}
void finalise() override {}
bool bends() const override {return true;}
void getDimensions(double& /*zBegin*/, double& /*zEnd*/) const override {}
StraightGeometry& getGeometry() override {return geom_m;}
const StraightGeometry& getGeometry() const override {return geom_m;}
ElementBase* clone() const override {return NULL;}
void setField(Vector_t bfield, Vector_t efield) {bfield_m = bfield; efield_m = efield;}
......
......@@ -67,7 +67,7 @@ public:
Vector_t getB(Vector_t pos) {
Vector_t mom, B, E;
double t;
double t = 0.0;
sector_m->apply(pos, mom, t, E, B);
return B;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment