Merge commit '20a091c3eddfdb67a82ece6413740a93650a2f98' into feature/feynman-rules

This commit is contained in:
portelli committed 2016-10-21 13:10:30 +01:00
commit bd6a228af6
16 files changed
+556 -95

No files matched your search

-3
View File
@@ -65,9 +65,6 @@ public:
class LatticeExpressionBase {};
template<class T> using Vector = std::vector<T,alignedAllocator<T> >; // Aligned allocator??
template<class T> using Matrix = std::vector<std::vector<T,alignedAllocator<T> > >; // Aligned allocator??
template <typename Op, typename T1>
class LatticeUnaryExpression : public std::pair<Op,std::tuple<T1> > , public LatticeExpressionBase {
public: