From a01662f126290ab5c8c178840828ea18ef8784b7 Mon Sep 17 00:00:00 2001 From: Keith Winstein Date: Thu, 13 Oct 2011 01:49:36 -0400 Subject: [PATCH] Added default constructors as required by newer G++ and C++11 --- terminalframebuffer.hpp | 15 +++++++++++++++ user.hpp | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/terminalframebuffer.hpp b/terminalframebuffer.hpp index bbc5cf3..2ce7d0e 100644 --- a/terminalframebuffer.hpp +++ b/terminalframebuffer.hpp @@ -43,6 +43,15 @@ namespace Terminal { 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 ); bool operator==( const Cell &x ) const @@ -63,6 +72,12 @@ namespace Terminal { : 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 delete_cell( int col, int background_color ); diff --git a/user.hpp b/user.hpp index 2d2fb4e..1d6afed 100644 --- a/user.hpp +++ b/user.hpp @@ -26,6 +26,14 @@ namespace Network { 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() /* 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 ); } };