[Debian-astro-commits] [gyoto] 169/221: + include/GyotoWorldline.h: remove prototypes for operators that were never implemented + python/: fix warnings about unkown base classes and cast operators
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit 4d8dd3151d84c5ee8def7c6fdc7703bf7d8f891e
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Sun Dec 28 16:14:28 2014 +0100
+ include/GyotoWorldline.h: remove prototypes for operators that were never implemented
+ python/: fix warnings about unkown base classes and cast operators
---
include/GyotoWorldline.h | 4 ----
python/gyoto.i | 33 +++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/include/GyotoWorldline.h b/include/GyotoWorldline.h
index a8befa0..043de1e 100644
--- a/include/GyotoWorldline.h
+++ b/include/GyotoWorldline.h
@@ -455,7 +455,6 @@ class Gyoto::Worldline
// ---------------------
public:
/// Assignment to another Worldline
- void operator=(const Worldline&) ;
void delta(const double delta); ///< Set #delta_
void delta(double, const std::string &unit); ///< Set #delta_ in specified units
double delta() const ; ///< Get #delta_
@@ -613,9 +612,6 @@ class Gyoto::Worldline
void save_txyz(char* const filename, double const t1, double const mass_sun,
double const distance_kpc, std::string const unit, SmartPointer<Screen> sc = NULL);///< Save, converted
- /// Display
- friend std::ostream& operator<<(std::ostream& , const Worldline& ) ;
-
protected:
virtual void tell(Gyoto::Hook::Teller*);
diff --git a/python/gyoto.i b/python/gyoto.i
index 07f51f2..4677ab9 100644
--- a/python/gyoto.i
+++ b/python/gyoto.i
@@ -4,6 +4,9 @@
%define GYOTO_SWIGIMPORTED
%enddef
+%define GYOTO_NO_DEPRECATED
+%enddef
+
%define GyotoSmPtrClass(klass)
%ignore Gyoto:: klass ;
%include Gyoto ## klass ## .h
@@ -79,6 +82,8 @@ using namespace Gyoto;
%}
+%include "GyotoConfig.h"
+
%include "GyotoError.h"
%exception {
@@ -113,9 +118,35 @@ using namespace Gyoto;
%rename(listRegister) Gyoto::Register::list;
%include GyotoRegister.h
+%ignore Gyoto::Functor::Double_constDoubleArray;
+%ignore Gyoto::Functor::Double_Double_const;
+%include "GyotoFunctors.h"
+
+%ignore Gyoto::Hook::Listener;
+%ignore Gyoto::Hook::Teller;
+%include "GyotoHooks.h"
+
+%ignore Gyoto::WIP;
+%include "GyotoWIP.h"
+
%ignore Gyoto::SmartPointer::operator();
+%rename(assign) Gyoto::SmartPointer::operator=;
%include "GyotoSmartPointer.h"
+%rename(assign) Gyoto::Value::operator=;
+%rename(toDouble) Gyoto::Value::operator double;
+%rename(toLong) Gyoto::Value::operator long;
+%rename(toULong) Gyoto::Value::operator unsigned long;
+%rename(toString) Gyoto::Value::operator std::string;
+%rename(toVDouble) Gyoto::Value::operator std::vector<double>;
+%{
+ typedef unsigned long unsignedlong;
+ %}
+%rename(toVULong) Gyoto::Value::operator std::vector<unsigned long>;
+%rename(toMetricPtr) Gyoto::Value::operator Gyoto::SmartPointer<Gyoto::Metric::Generic>;
+%rename(toAstrobjPtr) Gyoto::Value::operator Gyoto::SmartPointer<Gyoto::Astrobj::Generic>;
+%rename(toSpectrumPtr) Gyoto::Value::operator Gyoto::SmartPointer<Gyoto::Spectrum::Generic>;
+%rename(toSpectrometerPtr) Gyoto::Value::operator Gyoto::SmartPointer<Gyoto::Spectrometer::Generic>;
%include "GyotoValue.h"
%include "GyotoObject.h"
@@ -138,6 +169,7 @@ Gyoto::Worldline * pyGyotoCastToWorldline
GyotoSmPtrClass(Screen)
GyotoSmPtrClass(Scenery)
GyotoSmPtrClass(Photon)
+%rename(increment) Gyoto::Astrobj::Properties::operator++;
GyotoSmPtrClassGeneric(Astrobj)
%ignore Gyoto::Astrobj::Standard;
@@ -207,6 +239,7 @@ GyotoSmPtrClassDerivedPtrHdr(Spectrometer, Uniform, UniformSpectrometer, GyotoUn
enum CoordType_e;
+%rename(increment) *::operator++;
class Coord1dSet {
public:
const CoordType_e kind;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list