Commit e3eb673f authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixing compilation with nvcc.

parent a91981b8

src/core/vectors/tnlSharedVector.h

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ class tnlSharedVector : public tnlSharedArray< Real, Device, Index > 
   typedef tnlSharedVector< Real, tnlHost, Index > HostType;

   typedef tnlSharedVector< Real, tnlCuda, Index > CudaType;



   static constexpr tnlFunctionType getFunctionType() { return tnlDiscreteFunction; }

   //static constexpr tnlFunctionType getFunctionType() { return tnlDiscreteFunction; }

   enum { functionType = tnlDiscreteFunction };



   tnlSharedVector();

src/core/vectors/tnlVector.h

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ class tnlVector : public tnlArray< Real, Device, Index > 
   typedef tnlVector< Real, tnlHost, Index > HostType;

   typedef tnlVector< Real, tnlCuda, Index > CudaType;



   static constexpr tnlFunctionType getFunctionType() { return tnlDiscreteFunction; }

   //static constexpr tnlFunctionType getFunctionType() { return tnlDiscreteFunction; }

   enum { functionType = tnlDiscreteFunction };



   tnlVector();

src/functors/tnlFunction.h

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ class tnlFunction 
{

   public:

   

      static constexpr tnlFunctionType getFunctionType() { return FunctionType; }

      //static constexpr tnlFunctionType getFunctionType() { return FunctionType; }

      enum { functionType = FunctionType };

};



#endif	/* TNLFUNCTION_H */

src/functors/tnlFunctorAdapter.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


template< typename Mesh,

          typename Function,

          int FunctionType = Function::getFunctionType() >

          int FunctionType = Function::functionType >

class tnlFunctorAdapter

{

};

src/matrices/tnlCSRMatrix_impl.h

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ bool tnlCSRMatrix< Real, Device, Index >::addElementFast( const IndexType row, 
         this->values[ elementPtr ] = value;

         return true;

      }

   return false;

}



template< typename Real,