[Debian-astro-commits] [gyoto] 170/221: Screen::Coord1D/2DSet destructor is now public virtual

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 333a61c9fc961ddf5888c701bbcda585b9f71c69
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Sun Dec 28 17:26:14 2014 +0100

    Screen::Coord1D/2DSet destructor is now public virtual
---
 include/GyotoScreen.h | 4 ++++
 lib/Screen.C          | 2 ++
 python/gyoto.i        | 1 +
 python/gyoto_lorene.i | 2 ++
 python/gyoto_std.i    | 4 ++++
 5 files changed, 13 insertions(+)

diff --git a/include/GyotoScreen.h b/include/GyotoScreen.h
index 8bed6ec..701eece 100644
--- a/include/GyotoScreen.h
+++ b/include/GyotoScreen.h
@@ -610,6 +610,8 @@ class Gyoto::Screen
     public:
       /// Set kind during initialization
       Coord1dSet(CoordType_e k);
+      /// Virtual destructor
+      virtual ~Coord1dSet();
       /// Reset specifier to point to the first value
       virtual void begin() =0;
       /// True if pointing to something, false if end has been reached.
@@ -636,6 +638,8 @@ class Gyoto::Screen
       const CoordType_e kind;
       /// Set kind at initialisation
       Coord2dSet(CoordType_e k);
+      /// Virtual destructor
+      virtual ~Coord2dSet();
       /// Increment pointer
       virtual Coord2dSet& operator++()    =0;
       /// Get pixel coordinates
diff --git a/lib/Screen.C b/lib/Screen.C
index 3ecc470..a3b002b 100644
--- a/lib/Screen.C
+++ b/lib/Screen.C
@@ -1295,6 +1295,7 @@ SmartPointer<Screen> Screen::Subcontractor(FactoryMessenger* fmp) {
 //////// COORD2DSET
 
 Screen::Coord2dSet::Coord2dSet(CoordType_e k) : kind(k) {}
+Screen::Coord2dSet::~Coord2dSet() {}
 
 GYOTO_ARRAY<size_t, 2> Screen::Coord2dSet::operator* () const {
   if (kind==pixel)
@@ -1355,6 +1356,7 @@ Screen::Coord2dSet& Screen::Grid::operator++() {
 //////// COORD1DSET
 
 Screen::Coord1dSet::Coord1dSet(CoordType_e k) : kind(k) {}
+Screen::Coord1dSet::~Coord1dSet() {}
 
 size_t Screen::Coord1dSet::operator* () const {
   if (kind==pixel)
diff --git a/python/gyoto.i b/python/gyoto.i
index 4677ab9..32d31f3 100644
--- a/python/gyoto.i
+++ b/python/gyoto.i
@@ -169,6 +169,7 @@ Gyoto::Worldline * pyGyotoCastToWorldline
 GyotoSmPtrClass(Screen)
 GyotoSmPtrClass(Scenery)
 GyotoSmPtrClass(Photon)
+%rename(AstrobjProperties) Gyoto::Astrobj::Properties;
 %rename(increment) Gyoto::Astrobj::Properties::operator++;
 GyotoSmPtrClassGeneric(Astrobj)
 
diff --git a/python/gyoto_lorene.i b/python/gyoto_lorene.i
index 0f41c74..19bae3a 100644
--- a/python/gyoto_lorene.i
+++ b/python/gyoto_lorene.i
@@ -4,6 +4,8 @@
 %{
 
 #define GYOTO_NO_DEPRECATED
+#include "GyotoConfig.h"
+
 #include "GyotoWorldline.h"
 #include "GyotoPhoton.h"
 #include "GyotoUniformSphere.h"
diff --git a/python/gyoto_std.i b/python/gyoto_std.i
index b0af20e..f1712be 100644
--- a/python/gyoto_std.i
+++ b/python/gyoto_std.i
@@ -1,6 +1,10 @@
 %module(docstring="The Gyoto standard plug-in") gyoto_std
 %import gyoto.i
 %{
+
+#define GYOTO_NO_DEPRECATED
+#include "GyotoConfig.h"
+
 #include "GyotoWorldline.h"
 #include "GyotoPhoton.h"
 #include "GyotoUniformSphere.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git