Deleting name from tnlObject. (d6c97589) · Commits · TNL / tnl-dev

src/core/arrays/tnlConstSharedArray_impl.h

+3 −7

Original line number	Diff line number	Diff line
		@@ -78,11 +78,9 @@ void tnlConstSharedArray< Element, Device, Index > :: bind( const Element* data,
		{
		tnlAssert( size >= 0,
		cerr << "You try to set size of tnlConstSharedArray to negative value."
		<< "Name: " << this -> getName() << endl
		<< "New size: " << size << endl );
		tnlAssert( data != 0,
		cerr << "You try to use null pointer to data for tnlConstSharedArray."
		<< "Name: " << this -> getName() );
		cerr << "You try to use null pointer to data for tnlConstSharedArray." );

		this -> size = size;
		this -> data = data;
		@@ -141,7 +139,6 @@ Element tnlConstSharedArray< Element, Device, Index > :: getElement( Index i ) c
		{
		tnlAssert( 0 <= i && i < this -> getSize(),
		cerr << "Wrong index for getElement method in tnlConstSharedArray with name "
		<< this -> getName()
		<< " index is " << i
		<< " and array size is " << this -> getSize() );
		return tnlArrayOperations< Device >::getMemoryElement( &( this -> data[ i ] ) );
		@@ -155,7 +152,6 @@ const Element& tnlConstSharedArray< Element, Device, Index > :: operator[] ( Ind
		{
		tnlAssert( 0 <= i && i < this -> getSize(),
		cerr << "Wrong index for operator[] in tnlConstSharedArray with name "
		<< this -> getName()
		<< " index is " << i
		<< " and array size is " << this -> getSize() );
		// TODO: add static assert - this does not make sense for tnlCudaDevice
		@@ -241,7 +237,7 @@ template< typename Element,
		bool tnlConstSharedArray< Element, Device, Index > :: save( tnlFile& file ) const
		{
		tnlAssert( this -> size != 0,
		cerr << "You try to save empty array. Its name is " << this -> getName() );
		cerr << "You try to save empty array. );
		if( ! tnlObject :: save( file ) )
		return false;
		#ifdef HAVE_NOT_CXX11
		@@ -252,7 +248,7 @@ bool tnlConstSharedArray< Element, Device, Index > :: save( tnlFile& file ) cons
		return false;
		if( ! file. write< Element, Device, Index >( this -> data, this -> size ) )
		{
		cerr << "I was not able to WRITE tnlConstSharedArray " << this -> getName()
		cerr << "I was not able to WRITE tnlConstSharedArray "
		<< " with size " << this -> getSize() << endl;
		return false;
		}

src/core/arrays/tnlMultiArray1D_impl.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -155,10 +155,8 @@ bool tnlMultiArray< 1, Element, Device, Index > :: operator == ( const MultiArra
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == array. getDimensions(),
		cerr << "You are attempting to compare two arrays with different dimensions." << endl
		<< "First array name is " << this -> getName()
		<< " dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second array is " << array. getName()
		<< " dimensions are ( " << array. getDimensions() << " )" << endl; );
		<< "First array dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second array dimensions are ( " << array. getDimensions() << " )" << endl; );
		return tnlArray< Element, Device, Index > :: operator == ( array );
		}

src/core/tnlCurve.h

+3 −6

Original line number	Diff line number	Diff line
		@@ -184,14 +184,12 @@ template< class T > bool Write( const tnlCurve< T >& curve,
		tnlFile file;
		if( ! file. open( tnlString( file_name ) + tnlString( ".tnl" ), tnlWriteMode ) )
		{
		cerr << "I am not able to open the file " << file_name << " for drawing curve "
		<< curve. getName() <<"." << endl;
		cerr << "I am not able to open the file " << file_name << " for drawing curve." << endl;
		return false;
		}
		if( ! curve. save( file ) )
		{
		cerr << "I am not able to write to the file " << file_name << " for drawing grid "
		<< curve. getName() <<"." << endl;
		cerr << "I am not able to write to the file " << file_name << " for drawing grid." << endl;
		return false;
		}
		file. close();
		@@ -202,8 +200,7 @@ template< class T > bool Write( const tnlCurve< T >& curve,
		file. open( file_name, ios :: out );
		if( ! file )
		{
		cerr << "I am not able to to open the file " << file_name << " for drawing curve "
		<< curve. getName() <<"." << endl;
		cerr << "I am not able to to open the file " << file_name << " for drawing curve." << endl;
		return false;
		}
		bool result = Write( curve, file, format, step );

src/core/tnlObject.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -61,16 +61,6 @@ class tnlObject

		virtual tnlString getSerializationTypeVirtual() const;

		/****
		* Name getter
		*/
		//void setName( const tnlString& name );

		/****
		* Name getter
		*/
		//const tnlString& getName() const;

		//! Method for saving the object to a file as a binary data
		virtual bool save( tnlFile& file ) const;

src/core/vectors/tnlMultiVector1D_impl.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -147,10 +147,8 @@ bool tnlMultiVector< 1, Real, Device, Index > :: operator == ( const MultiVector
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to compare two Vectors with different dimensions." << endl
		<< "First Vector name is " << this -> getName()
		<< " dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector is " << Vector. getName()
		<< " dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		<< "First Vector name dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		return tnlVector< Real, Device, Index > :: operator == ( Vector );
		}