Commit f8aa7c1c authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Removed HAVE_NOT_CXX11 macro from old code

parent 47dfaaf0

src/TNL/Matrices/EllpackSymmetricGraph_impl.h

+0 −8
Original line number Diff line number Diff line
@@ -746,11 +746,7 @@ template< typename Real, 
bool EllpackSymmetricGraph< Real, Device, Index >::save( File& file ) const

{

   if( ! Sparse< Real, Device, Index >::save( file) ) return false;

#ifdef HAVE_NOT_CXX11

   if( ! file.write< IndexType, Devices::Host, IndexType >( &this->rowLengths, 1 ) ) return false;

#else      

   if( ! file.write( &this->rowLengths ) ) return false;

#endif   

   return true;

}
@@ -760,11 +756,7 @@ template< typename Real, 
bool EllpackSymmetricGraph< Real, Device, Index >::load( File& file )

{

   if( ! Sparse< Real, Device, Index >::load( file) ) return false;

#ifdef HAVE_NOT_CXX11

   if( ! file.read< IndexType, Devices::Host, IndexType >( &this->rowLengths, 1 ) ) return false;

#else   

   if( ! file.read( &this->rowLengths ) ) return false;

#endif   

   return true;

}

src/TNL/Matrices/EllpackSymmetric_impl.h

+0 −8
Original line number Diff line number Diff line
@@ -540,11 +540,7 @@ template< typename Real, 
bool EllpackSymmetric< Real, Device, Index >::save( File& file ) const

{

   if( ! Sparse< Real, Device, Index >::save( file) ) return false;

#ifdef HAVE_NOT_CXX11

   if( ! file.write< IndexType, Devices::Host, IndexType >( &this->rowLengths, 1 ) ) return false;

#else      

   if( ! file.write( &this->rowLengths ) ) return false;

#endif   

   return true;

}
@@ -554,11 +550,7 @@ template< typename Real, 
bool EllpackSymmetric< Real, Device, Index >::load( File& file )

{

   if( ! Sparse< Real, Device, Index >::load( file) ) return false;

#ifdef HAVE_NOT_CXX11

   if( ! file.read< IndexType, Devices::Host, IndexType >( &this->rowLengths, 1 ) ) return false;

#else   

   if( ! file.read( &this->rowLengths ) ) return false;

#endif   

   return true;

}

src/TNL/legacy/tnlMatrix_impl.h

+0 −16
Original line number Diff line number Diff line
@@ -191,19 +191,11 @@ template< typename Real, 
          typename Index >

bool tnlMatrix< Real, Device, Index >::save( File& file ) const

{

#ifdef HAVE_NOT_CXX11

   if( ! tnlObject::save( file ) ||

       ! file.write< IndexType, Devices::Host, Index >( &this->rows, 1 ) ||

       ! file.write< IndexType, Devices::Host, Index >( &this->columns, 1 ) ||

       ! this->values.save( file ) )

      return false;

#else   

   if( ! tnlObject::save( file ) ||

       ! file.write( &this->rows ) ||

       ! file.write( &this->columns ) ||

       ! this->values.save( file ) )

      return false;

#endif      

   return true;

}
@@ -212,19 +204,11 @@ template< typename Real, 
          typename Index >

bool tnlMatrix< Real, Device, Index >::load( File& file )

{

#ifdef HAVE_NOT_CXX11

   if( ! tnlObject::load( file ) ||

       ! file.read< IndexType, Devices::Host, Index >( &this->rows, 1 ) ||

       ! file.read< IndexType, Devices::Host, Index >( &this->columns, 1 ) ||

       ! this->values.load( file ) )

      return false;

#else   

   if( ! tnlObject::load( file ) ||

       ! file.read( &this->rows ) ||

       ! file.read( &this->columns ) ||

       ! this->values.load( file ) )

      return false;

#endif      

   return true;

}

tests/unit-tests/mesh/tnlGridTest.cpp

+0 −8
Original line number Diff line number Diff line
@@ -12,14 +12,11 @@ 
#include <TNL/Devices/Host.h>

#include <cstdlib>



#ifndef HAVE_NOT_CXX11

#include "tnlGridTester.h"

#endif

#include "../tnlUnitTestStarter.h"



int main( int argc, char* argv[] )

{

#ifndef HAVE_NOT_CXX11

#ifdef HAVE_CPPUNIT

   if( ! tnlUnitTestStarter :: run< GridTester< 1, double, Devices::Host, int > >() ||

       ! tnlUnitTestStarter :: run< GridTester< 2, double, Devices::Host, int > >() ||
@@ -30,9 +27,4 @@ int main( int argc, char* argv[] ) 
#else

   return EXIT_FAILURE;

#endif

#endif

}