[Gnash-commit] /srv/bzr/gnash/trunk r10772: Do something in the boost-required copy ctor: just create a new instance; don't return const std::string& as it seems like boost::python is unable to deal with that

[Sandro Santilli]

------------------------------------------------------------
revno: 10772
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2009-04-06 10:32:34 +0200
message:
  Do something in the boost-required copy ctor: just create a new instance; 
don't return const std::string& as it seems like boost::python is unable to 
deal with that
modified:
  pythonmodule/gnashpython.cpp
  pythonmodule/gnashpython.h

=== modified file 'pythonmodule/gnashpython.cpp'
--- a/pythonmodule/gnashpython.cpp      2009-04-04 10:39:24 +0000
+++ b/pythonmodule/gnashpython.cpp      2009-04-06 08:32:34 +0000
@@ -63,6 +63,18 @@
 {
 }
 
+GnashPlayer::GnashPlayer(const GnashPlayer& o)
+       :
+    _movieDef(NULL),
+    _movieRoot(NULL),
+    _renderer(NULL),
+    _logFile(gnash::LogFile::getDefaultInstance()),
+    _xpos(0),
+    _ypos(0),
+    _url("")
+{
+}
+
 GnashPlayer::~GnashPlayer()
 {
     close();

=== modified file 'pythonmodule/gnashpython.h'
--- a/pythonmodule/gnashpython.h        2009-04-04 10:39:24 +0000
+++ b/pythonmodule/gnashpython.h        2009-04-06 08:32:34 +0000
@@ -69,8 +69,9 @@
     GnashPlayer();
     ~GnashPlayer();
 
-    // This seems required by BOOST_PYTHON_MODULE ?
-    GnashPlayer(const GnashPlayer&) {};
+    // This seems required by BOOST_PYTHON_MODULE, we'll just
+    // construct a new instance here
+    GnashPlayer(const GnashPlayer&);
 
     // For exiting
     void close();
@@ -163,7 +164,7 @@
     // The only constant aspect of a character?
     int id() { return _character->get_id(); }
 
-    const std::string& name() { return _character->get_name(); }
+    std::string name() { return _character->get_name(); }
 
     //const char* textName() { return _character->get_text_name(); }