Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation errors with C++20 #9

Merged
merged 7 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/TypesafeCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class TypesafeCollection
}

virtual ~TypesafeCollection(){}
TypesafeCollection<T>(const TypesafeCollection<T>&) = delete;
TypesafeCollection<T>& operator=(const TypesafeCollection<T>&) = delete;
TypesafeCollection(const TypesafeCollection<T>&) = delete;
TypesafeCollection& operator=(const TypesafeCollection<T>&) = delete;

bool is_valid()
{
Expand Down
8 changes: 4 additions & 4 deletions vertex_lcfi/util/inc/memorymanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,18 @@ namespace vertex_lcfi
//Protect the constructor, copy and assignment to prevent usage.
protected:
//! Do not use
MemoryManager<T>() {}
MemoryManager() = default;
//! Do not use
MemoryManager<T>(const MemoryManager<T>&) {}
MemoryManager(const MemoryManager<T>&) = delete;
//! Do not use
MemoryManager<T>& operator= (const MemoryManager<T>&) {return MemoryManager<T>();}
MemoryManager<T>& operator= (const MemoryManager<T>&) = delete;
private:
std::vector<T*> _Objects{};

};

template <class T>
MemoryManager<T>::~MemoryManager<T>()
MemoryManager<T>::~MemoryManager()
{
//Delete all in case the user hasn't done so
this->delAll();
Expand Down
4 changes: 2 additions & 2 deletions vertex_lcfi/zvtop/include/maxminfinder.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ namespace ZVTOP
FunctionMinimiser( T* funcClass, double initialDelta, unsigned int decimalPlaces );
~FunctionMinimiser(){};//I doubt this will be derived from but stick it in anyway
std::vector<double> Minimise( const std::vector<double> & seedPoint );
FunctionMinimiser<T>(const FunctionMinimiser<T>&) = delete;
FunctionMinimiser<T>& operator=(const FunctionMinimiser<T>&) = delete;
FunctionMinimiser(const FunctionMinimiser<T>&) = delete;
FunctionMinimiser& operator=(const FunctionMinimiser<T>&) = delete;
protected:
//Method that finds a vector that 'points down hill' by examining the rate of
//change of the function at the point "point".
Expand Down