Commit 87cbf168 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Terminated the HAVE_NOT_CXX11 macro

parent 88f0b8eb

CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ if( WITH_CUDA STREQUAL "yes" ) 
        #   reference for the -Xcudafe flag: http://stackoverflow.com/questions/14831051/how-to-disable-compiler-warnings-with-nvcc/17095910#17095910

        #   list of possible tokens: http://www.ssl.berkeley.edu/~jimm/grizzly_docs/SSL/opt/intel/cc/9.0/lib/locale/en_US/mcpcom.msg

        set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ; -Wno-deprecated-gpu-targets --expt-relaxed-constexpr --expt-extended-lambda -Xcudafe "\"--diag_suppress=code_is_unreachable --diag_suppress=implicit_return_from_non_void_function\"")

        #AddCompilerFlag( "-DHAVE_NOT_CXX11" ) # -U_GLIBCXX_ATOMIC_BUILTINS -U_GLIBCXX_USE_INT128 " )

        set( ALL_CUDA_ARCHS -gencode arch=compute_20,code=sm_20

                            -gencode arch=compute_30,code=sm_30

                            -gencode arch=compute_32,code=sm_32

src/TNL/Containers/Array.h

+0 −5
Original line number Diff line number Diff line
@@ -118,13 +118,8 @@ class Array : public virtual Object 
       * Every time one touches this grid touches * size * sizeof( Real ) bytes are added

       * to transfered bytes in tnlStatistics.

       */

   #ifdef HAVE_NOT_CXX11

      template< typename IndexType2 >

      void touch( IndexType2 touches = 1 ) const;

   #else

      template< typename IndexType2 = Index >

      void touch( IndexType2 touches = 1 ) const;

   #endif



      //! Method for saving the object to a file as a binary data.

      bool save( File& file ) const;

src/TNL/Containers/Array_impl.h

+0 −15
Original line number Diff line number Diff line
@@ -488,13 +488,8 @@ bool Array< Element, Device, Index > :: save( File& file ) const 
{

   if( ! Object :: save( file ) )

      return false;

#ifdef HAVE_NOT_CXX11

   if( ! file. write< const Index, Devices::Host >( &this->size ) )

      return false;

#else

   if( ! file. write( &this->size ) )

      return false;

#endif

   if( this->size != 0 && ! ArrayIO< Element, Device, Index >::save( file, this->data, this->size ) )

   {

      cerr << "I was not able to save " << this->getType()
@@ -514,13 +509,8 @@ load( File& file ) 
   if( ! Object :: load( file ) )

      return false;

   Index _size;

#ifdef HAVE_NOT_CXX11

   if( ! file. read< Index, Devices::Host >( &_size ) )

      return false;

#else

   if( ! file. read( &_size ) )

      return false;

#endif

   if( _size < 0 )

   {

      cerr << "Error: The size " << _size << " of the file is not a positive number or zero." << endl;
@@ -549,13 +539,8 @@ boundLoad( File& file ) 
   if( ! Object :: load( file ) )

      return false;

   Index _size;

#ifdef HAVE_NOT_CXX11

   if( ! file. read< Index, Devices::Host >( &_size ) )

      return false;

#else

   if( ! file. read( &_size ) )

      return false;

#endif

   if( _size < 0 )

   {

      cerr << "Error: The size " << _size << " of the file is not a positive number or zero." << endl;

src/TNL/Containers/ConstSharedArray.h

+0 −5
Original line number Diff line number Diff line
@@ -91,13 +91,8 @@ class tnlConstSharedArray : public Object 
    * Every time one touches this grid touches * size * sizeof( Real ) bytes are added

    * to transfered bytes in tnlStatistics.

    */

#ifdef HAVE_NOT_CXX11

   template< typename IndexType2 >

   void touch( IndexType2 touches = 1 ) const;

#else

   template< typename IndexType2 = Index >

   void touch( IndexType2 touches = 1 ) const;

#endif



   //! Method for saving the object to a file as a binary data.

   bool save( File& file ) const;

src/TNL/Containers/ConstSharedArray_impl.h

+0 −4
Original line number Diff line number Diff line
@@ -232,11 +232,7 @@ bool tnlConstSharedArray< Element, Device, Index > :: save( File& file ) const 
              std::cerr << "You try to save empty array." );

   if( ! Object :: save( file ) )

      return false;

#ifdef HAVE_NOT_CXX11

   if( ! file. write< const Index, Device >( &this->size ) )

#else

   if( ! file. write( &this->size ) )

#endif

      return false;

   if( ! file. write< Element, Device, Index >( this->data, this->size ) )

   {