ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace ptr_vector by lib:ScopedPtrVect. passes compiler.

Browse source
This commit is contained in:
Fischlurch 2009-02-08 01:35:45 +01:00
parent e435822de6
commit 4524c23832
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/display-service.cpp
View file

@ -192,8 +192,7 @@ namespace gui {
DisplayService::setUp (FrameDestination const& outputDestination) DisplayService::setUp (FrameDestination const& outputDestination)
{ {
DisplayerTab& slots (_instance->slots_); DisplayerTab& slots (_instance->slots_);
slots.push_back (new DisplayerSlot (outputDestination)); return &slots.manage (new DisplayerSlot (outputDestination));
return &slots.back();
} }

6
src/gui/display-service.hpp
View file

@ -42,12 +42,11 @@
#include "include/display-facade.h" #include "include/display-facade.h"
#include "common/instancehandle.hpp" #include "common/instancehandle.hpp"
#include "lib/singleton-ref.hpp" #include "lib/singleton-ref.hpp"
#include "lib/scoped-ptrvect.hpp"
#include <glibmm.h> #include <glibmm.h>
#include <sigc++/sigc++.h> #include <sigc++/sigc++.h>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
//#include <boost/scoped_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
#include <string> #include <string>
#include <vector> #include <vector>
@ -56,7 +55,6 @@ namespace gui {
using std::string; using std::string;
using std::vector; using std::vector;
using boost::ptr_vector;
using lumiera::Display; using lumiera::Display;
using Glib::Dispatcher; using Glib::Dispatcher;
@ -98,7 +96,7 @@ namespace gui {
}; };
typedef ptr_vector<DisplayerSlot> DisplayerTab; typedef lib::ScopedPtrVect<DisplayerSlot> DisplayerTab;