portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-07-26 09:17:08 +01:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Antonin Portelli
2016-10-21 13:10:30 +01:00
parent 63d219498b 20a091c3ed
commit bd6a228af6
16 changed files with 556 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tensors/Tensor_extract_merge.h
View File

@@ -250,8 +250,7 @@ void merge(vobj &vec,std::vector<typename vobj::scalar_object *> &extracted,int
}
}
template<class vobj> inline
void merge1(vobj &vec,std::vector<typename vobj::scalar_object *> &extracted,int offset)
template<class vobj> inline void merge1(vobj &vec,std::vector<typename vobj::scalar_object *> &extracted,int offset)
{
typedef typename vobj::scalar_type scalar_type ;
typedef typename vobj::vector_type vector_type ;
@@ -269,8 +268,7 @@ void merge1(vobj &vec,std::vector<typename vobj::scalar_object *> &extracted,int
}}
}
template<class vobj> inline
void merge2(vobj &vec,std::vector<typename vobj::scalar_object *> &extracted,int offset)
template<class vobj> inline void merge2(vobj &vec,std::vector<typename vobj::scalar_object *> &extracted,int offset)
{
typedef typename vobj::scalar_type scalar_type ;
typedef typename vobj::vector_type vector_type ;