Changeset a570798b2d7cb105115f686ea241f8638b3f720f

Show
Ignore:
Timestamp:
01/06/07 23:55:46 (6 years ago)
Author:
Philipp Kern <phil@…>
Parents:
67caaeabde8e497a21e192227af5e3076c80ed75
Children:
81cd225b8ce1ba5dada779c18f90182854af373e
git-committer:
Philipp Kern <phil@0x539.de> / 2007-01-06T22:55:46Z+0000
Message:

[project @ Removed covariant returns from buffer wrapper]

Original author: Armin Burgmeier <armin@…>
Date: 2005-11-22 17:46:15+00:00

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • inc/io/buffer_wrapper.hpp

    re6b1230 ra570798  
    228228{ 
    229229public: 
     230        typedef net6::client base_net_type; 
    230231        typedef client net_type; 
    231232 
     
    240241        Gtk::Window& m_window; 
    241242#endif 
    242         virtual net_type* new_net(); 
     243        virtual base_net_type* new_net(); 
    243244}; 
    244245 
     
    248249{ 
    249250public: 
     251        typedef net6::server base_net_type; 
    250252        typedef server net_type; 
    251253 
     
    260262        Gtk::Window& m_window; 
    261263#endif 
    262         net_type* new_net(unsigned int port); 
     264        base_net_type* new_net(unsigned int port); 
    263265}; 
    264266 
     
    270272{ 
    271273public: 
     274        typedef net6::server base_net_type; 
    272275        typedef host net_type; 
    273276 
     
    282285 
    283286protected: 
    284         net_type* new_net(unsigned int port); 
     287        base_net_type* new_net(unsigned int port); 
    285288}; 
    286289 
  • src/io/buffer_wrapper.cpp

    re6b1230 ra570798  
    315315} 
    316316 
    317 obby::io::client_buffer::net_type* obby::io::client_buffer::new_net() 
     317obby::io::client_buffer::base_net_type* obby::io::client_buffer::new_net() 
    318318{ 
    319319#ifdef WIN32 
     
    335335} 
    336336 
    337 obby::io::server_buffer::net_type* 
     337obby::io::server_buffer::base_net_type* 
    338338obby::io::server_buffer::new_net(unsigned int port) 
    339339{ 
     
    362362} 
    363363 
    364 obby::io::host_buffer::net_type* 
     364obby::io::host_buffer::base_net_type* 
    365365obby::io::host_buffer::new_net(unsigned int port) 
    366366{