Added default constructors as required by newer G++ and C++11

This commit is contained in:
Keith Winstein
2011-10-13 01:49:36 -04:00
parent 80f34faadd
commit a01662f126
2 changed files with 23 additions and 0 deletions
+15
View File
@@ -43,6 +43,15 @@ namespace Terminal {
renditions( background_color ) renditions( background_color )
{} {}
Cell() /* default constructor required by C++11 STL */
: contents(),
fallback( false ),
width( 1 ),
renditions( 0 )
{
assert( false );
}
void reset( int background_color ); void reset( int background_color );
bool operator==( const Cell &x ) const bool operator==( const Cell &x ) const
@@ -63,6 +72,12 @@ namespace Terminal {
: cells( s_width, Cell( background_color ) ), wrap( false ) : cells( s_width, Cell( background_color ) ), wrap( false )
{} {}
Row() /* default constructor required by C++11 STL */
: cells( 1, Cell() ), wrap( false )
{
assert( false );
}
void insert_cell( int col, int background_color ); void insert_cell( int col, int background_color );
void delete_cell( int col, int background_color ); void delete_cell( int col, int background_color );
+8
View File
@@ -26,6 +26,14 @@ namespace Network {
UserEvent( Parser::UserByte s_userbyte ) : type( UserByteType ), userbyte( s_userbyte ), resize( -1, -1 ) {} UserEvent( Parser::UserByte s_userbyte ) : type( UserByteType ), userbyte( s_userbyte ), resize( -1, -1 ) {}
UserEvent( Parser::Resize s_resize ) : type( ResizeType ), userbyte( 0 ), resize( s_resize ) {} UserEvent( Parser::Resize s_resize ) : type( ResizeType ), userbyte( 0 ), resize( s_resize ) {}
UserEvent() /* default constructor required by C++11 STL */
: type( UserByteType ),
userbyte( 0 ),
resize( -1, -1 )
{
assert( false );
}
bool operator==( const UserEvent &x ) const { return ( type == x.type ) && ( userbyte == x.userbyte ) && ( resize == x.resize ); } bool operator==( const UserEvent &x ) const { return ( type == x.type ) && ( userbyte == x.userbyte ) && ( resize == x.resize ); }
}; };