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

src/core/containers/tnlContainer_impl.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -88,8 +88,7 @@ bool tnlContainer< Element, Device, Index >::save( tnlFile& file ) const
		if( ! tnlObject::save( file ) \|\|
		! this->data.save( file ) )
		{
		cerr << "I am no able to save " << this->getType()
		<< " " << this->getName() << "." << endl;
		cerr << "I am no able to save " << this->getType() << "." << endl;
		return false;
		}
		return true;
		@@ -101,8 +100,7 @@ bool tnlContainer< Element, Device, Index >::load( tnlFile& file )
		if( ! tnlObject::load( file ) \|\|
		! this->data.load( file ) )
		{
		cerr << "I am no able to load " << this->getType()
		<< " " << this->getName() << "." << endl;
		cerr << "I am no able to load " << this->getType() << "." << endl;
		return false;
		}
		return true;

src/core/containers/tnlStaticContainer_impl.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -70,8 +70,7 @@ bool tnlStaticContainer< Size, Element >::save( tnlFile& file ) const
		if( ! tnlObject::save( file ) \|\|
		! this->data.save( file ) )
		{
		cerr << "I am no able to save " << this->getType()
		<< " " << this->getName() << "." << endl;
		cerr << "I am no able to save " << this->getType() << "." << endl;
		return false;
		}
		return true;
		@@ -83,8 +82,7 @@ bool tnlStaticContainer< Size, Element >::load( tnlFile& file )
		if( ! tnlObject::load( file ) \|\|
		! this->data.load( file ) )
		{
		cerr << "I am no able to load " << this->getType()
		<< " " << this->getName() << "." << endl;
		cerr << "I am no able to load " << this->getType() << "." << endl;
		return false;
		}
		return true;

src/core/vectors/tnlMultiVector1D_impl.h

+10 −18

Original line number	Diff line number	Diff line
		@@ -25,11 +25,11 @@ tnlMultiVector< 1, Real, Device, Index > :: tnlMultiVector()
		{
		}

		template< typename Real, typename Device, typename Index >
		/*template< typename Real, typename Device, typename Index >
		tnlMultiVector< 1, Real, Device, Index > :: tnlMultiVector( const tnlString& name )
		{
		this -> setName( name );
		}
		}*/

		template< typename Real, typename Device, typename Index >
		tnlString tnlMultiVector< 1, Real, Device, Index > :: getType()
		@@ -168,10 +168,8 @@ tnlMultiVector< 1, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign 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 dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -184,10 +182,8 @@ tnlMultiVector< 1, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign 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 dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -197,14 +193,12 @@ bool tnlMultiVector< 1, Real, Device, Index > :: save( tnlFile& file ) const
		{
		if( ! tnlVector< Real, Device, Index > :: save( file ) )
		{
		cerr << "I was not able to write the tnlVector of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to write the tnlVector of tnlMultiVector." << endl;
		return false;
		}
		if( ! dimensions. save( file ) )
		{
		cerr << "I was not able to write the dimensions of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to write the dimensions of tnlMultiVector." << endl;
		return false;
		}
		return true;
		@@ -215,14 +209,12 @@ bool tnlMultiVector< 1, Real, Device, Index > :: load( tnlFile& file )
		{
		if( ! tnlVector< Real, Device, Index > :: load( file ) )
		{
		cerr << "I was not able to read the tnlVector of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to read the tnlVector of tnlMultiVector." << endl;
		return false;
		}
		if( ! dimensions. load( file ) )
		{
		cerr << "I was not able to read the dimensions of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to read the dimensions of tnlMultiVector." << endl;
		return false;
		}
		return true;

src/core/vectors/tnlMultiVector2D_impl.h

+12 −22

Original line number	Diff line number	Diff line
		@@ -25,11 +25,11 @@ tnlMultiVector< 2, Real, Device, Index > :: tnlMultiVector()
		{
		}

		template< typename Real, typename Device, typename Index >
		/*template< typename Real, typename Device, typename Index >
		tnlMultiVector< 2, Real, Device, Index > :: tnlMultiVector( const tnlString& name )
		{
		this -> setName( name );
		}
		}*/


		template< typename Real, typename Device, typename Index >
		@@ -155,10 +155,8 @@ bool tnlMultiVector< 2, 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 dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		return tnlVector< Real, Device, Index > :: operator == ( Vector );
		}

		@@ -176,10 +174,8 @@ tnlMultiVector< 2, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign 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 dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -192,10 +188,8 @@ tnlMultiVector< 2, Real, Device, Index >&
		// TODO: Static assert on dimensions
		tnlAssert( this -> getDimensions() == Vector. getDimensions(),
		cerr << "You are attempting to assign 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 dimensions are ( " << this -> getDimensions() << " )" << endl
		<< "Second Vector dimensions are ( " << Vector. getDimensions() << " )" << endl; );
		tnlVector< Real, Device, Index > :: operator = ( Vector );
		return ( *this );
		}
		@@ -205,14 +199,12 @@ bool tnlMultiVector< 2, Real, Device, Index > :: save( tnlFile& file ) const
		{
		if( ! tnlVector< Real, Device, Index > :: save( file ) )
		{
		cerr << "I was not able to write the tnlVector of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to write the tnlVector of tnlMultiVector." << endl;
		return false;
		}
		if( ! dimensions. save( file ) )
		{
		cerr << "I was not able to write the dimensions of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to write the dimensions of tnlMultiVector." << endl;
		return false;
		}
		return true;
		@@ -223,14 +215,12 @@ bool tnlMultiVector< 2, Real, Device, Index > :: load( tnlFile& file )
		{
		if( ! tnlVector< Real, Device, Index > :: load( file ) )
		{
		cerr << "I was not able to read the tnlVector of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to read the tnlVector of tnlMultiVector." << endl;
		return false;
		}
		if( ! dimensions. load( file ) )
		{
		cerr << "I was not able to read the dimensions of tnlMultiVector "
		<< this -> getName() << endl;
		cerr << "I was not able to read the dimensions of tnlMultiVector." << endl;
		return false;
		}
		return true;

src/core/vectors/tnlMultiVector3D_impl.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,11 +25,11 @@ tnlMultiVector< 3, Real, Device, Index > :: tnlMultiVector()
		{
		}

		template< typename Real, typename Device, typename Index >
		/*template< typename Real, typename Device, typename Index >
		tnlMultiVector< 3, Real, Device, Index > :: tnlMultiVector( const tnlString& name )
		{
		this -> setName( name );
		}
		}*/

		template< typename Real, typename Device, typename Index >
		tnlString tnlMultiVector< 3, Real, Device, Index > :: getType()