Commit c30c07b6 authored by Tomáš Jakubec's avatar Tomáš Jakubec
Browse files

Bugfix caused by test changes and debugging tools.

parent dc659479

src/TNL/Containers/VectorExpressions.h

+0 −9
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ auto 
operator+( const Vector< Real, Device, Index, Allocator >& a, const ET& b )

{

   using ConstView = typename Vector< Real, Device, Index, Allocator >::ConstViewType;

DBGVAR(a, b);

   return Expressions::BinaryExpressionTemplate< ConstView, ET, Expressions::Addition >( a.getConstView(), b );

}
@@ -39,7 +38,6 @@ auto 
operator+( const ET& a, const Vector< Real, Device, Index, Allocator >& b )

{

   using ConstView = typename Vector< Real, Device, Index, Allocator >::ConstViewType;

    DBGVAR(b);

   return Expressions::BinaryExpressionTemplate< ET, ConstView, Expressions::Addition >( a, b.getConstView() );

}

/*
@@ -49,7 +47,6 @@ auto 
operator+( ET&& a, const Vector< Real, Device, Index, Allocator >& b )

{

   using ConstView = typename Vector< Real, Device, Index, Allocator >::ConstViewType;

    DBGVAR(b);

   return Expressions::BinaryExpressionTemplate< ET, ConstView, Expressions::Addition >( a, b.getConstView() );

}*/
@@ -60,7 +57,6 @@ auto 
operator+( const ET& a, Vector< Real, Device, Index, Allocator >&& b )

{

   using View = typename Vector< Real, Device, Index, Allocator >::ViewType;

    DBGVAR(b);

   return Expressions::BinaryExpressionTemplate< ET, View, Expressions::Addition >( a, b.getView() );

}
@@ -70,7 +66,6 @@ operator+( const Vector< Real1, Device, Index, Allocator >& a, const Vector< Rea 
{

   using ConstView1 = typename Vector< Real1, Device, Index, Allocator >::ConstViewType;

   using ConstView2 = typename Vector< Real2, Device, Index, Allocator >::ConstViewType;

    DBGVAR(a,b);

   return Expressions::BinaryExpressionTemplate< ConstView1, ConstView2, Expressions::Addition >( a.getConstView(), b.getConstView() );

}
@@ -81,7 +76,6 @@ operator+( Vector< Real1, Device, Index, Allocator >&& a, const Vector< Real2, D 
{

   using View1 = typename Vector< Real1, Device, Index, Allocator >::ConstViewType;

   using ConstView2 = typename Vector< Real2, Device, Index, Allocator >::ConstViewType;

    DBGVAR(a,b);

   return Expressions::BinaryExpressionTemplate< View1, ConstView2, Expressions::Addition >( a.getView(), b.getConstView() );

}
@@ -91,7 +85,6 @@ operator+( const Vector< Real1, Device, Index, Allocator >& a, Vector< Real2, De 
{

   using ConstView1 = typename Vector< Real1, Device, Index, Allocator >::ConstViewType;

   using View2 = typename Vector< Real2, Device, Index, Allocator >::ViewType;

    DBGVAR(a,b);

   return Expressions::BinaryExpressionTemplate< ConstView1, View2, Expressions::Addition >( a.getConstView(), b.getView() );

}
@@ -101,7 +94,6 @@ operator+( const VectorView< Real1, Device, Index >& a, const Vector< Real2, Dev 
{

   using ConstView1 = typename Vector< Real1, Device, Index, Allocator >::ConstViewType;

   using ConstView2 = typename Vector< Real2, Device, Index, Allocator >::ConstViewType;

    DBGVAR(a,b);

   return Expressions::BinaryExpressionTemplate< ConstView1, ConstView2, Expressions::Addition >( a.getConstView(), b.getConstView() );

}
@@ -111,7 +103,6 @@ operator+( const Vector< Real1, Device, Index, Allocator >& a, const VectorView< 
{

   using ConstView1 = typename Vector< Real1, Device, Index, Allocator >::ConstViewType;

   using ConstView2 = typename Vector< Real2, Device, Index, Allocator >::ConstViewType;

    DBGVAR(a,b);

   return Expressions::BinaryExpressionTemplate< ConstView1, ConstView2, Expressions::Addition >( a.getConstView(), b.getConstView() );

}

src/TNL/SystemInfo.hpp

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ SystemInfo::getHostname( void ) 
#if defined(LINUX)

   char host_name[ 256 ];

   gethostname( host_name, 255 );

   return String( std::string(host_name, size) );

   return String( host_name );

#elif defined(WIN32)

    WCHAR host_name[256] = L"";

    DWORD size = sizeof (host_name);