1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-17 07:17:06 +01:00

Merge develop

This commit is contained in:
Peter Boyle
2019-07-16 11:59:56 +01:00
parent fa9cd50c5b
commit 08904f830e
164 changed files with 5901 additions and 228 deletions

View File

@ -20,12 +20,11 @@ Author: Michael Marshall <michael.marshall@ed.ac.au>
See the full license in the file "LICENSE" in the top level distribution directory
*************************************************************************************/
/* END LEGAL */
#ifndef GRID_MATH_TRAITS_H
#define GRID_MATH_TRAITS_H
#pragma once
#include <type_traits>
namespace Grid {
NAMESPACE_BEGIN(Grid);
// Forward declarations
template<class T> class iScalar;
@ -281,7 +280,5 @@ namespace Grid {
enum { value = sizeof(real_scalar_type)/sizeof(float) };
};
}
#endif
NAMESPACE_END(Grid);