[yoda-svn] r319 - in trunk: . pyext/yoda

[blackhole at projects.hepforge.org]

Author: buckley
Date: Mon Aug 22 12:23:29 2011
New Revision: 319

Log:
Tweaking the SWIG interfacing to remove warnings about unsupported operator=s

Modified:
   trunk/TODO
   trunk/pyext/yoda/yodawrap.i

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	Mon Aug 22 12:16:37 2011	(r318)
+++ trunk/TODO	Mon Aug 22 12:23:29 2011	(r319)
@@ -7,6 +7,8 @@
 
 * Rebinning in 1D: merges of n adjacent bins (AB)
 
+* Add copy assignment to Point/Scatter3D and Dbn1D/2D.
+
 * Add bin removal to Axis2D: should allow removal of the "ghost" mechanism and
   hence clean up the Axis2D::Bins type. Clean and comment the caching
   mechanism. (MICHAL)

Modified: trunk/pyext/yoda/yodawrap.i
==============================================================================
--- trunk/pyext/yoda/yodawrap.i	Mon Aug 22 12:16:37 2011	(r318)
+++ trunk/pyext/yoda/yodawrap.i	Mon Aug 22 12:23:29 2011	(r319)
@@ -45,6 +45,7 @@
 
 // Bin base classes and contained distributions
 %include "YODA/Bin.h"
+%feature("ignore") YODA::Bin1D::operator=;
 %include "YODA/Bin1D.h"
 %include "YODA/Bin2D.h"
 %include "YODA/Dbn1D.h"
@@ -53,6 +54,8 @@
 
 // Histos
 %template(Bin1DDbn1D) YODA::Bin1D<YODA::Dbn1D>;
+%feature("ignore") YODA::HistoBin1D::operator=;
+%feature("ignore") YODA::Histo1D::operator=;
 %include "YODA/HistoBin1D.h"
 %include "YODA/Histo1D.h"
 // %feature("ignore") std::vector<YODA::HistoBin1D>::vector(size_type size);
@@ -65,6 +68,8 @@
 %feature("ignore") YODA::HistoBin2D::transformY;
 %feature("ignore") YODA::Histo2D::mkProfileX;
 %feature("ignore") YODA::Histo2D::mkProfileY;
+%feature("ignore") YODA::HistoBin2D::operator=;
+%feature("ignore") YODA::Histo2D::operator=;
 %include "YODA/HistoBin2D.h"
 %include "YODA/Histo2D.h"
 // %feature("ignore") std::vector<YODA::HistoBin2D>::vector(size_type size);
@@ -74,6 +79,8 @@
 
 // Profile histos
 %template(Bin1DDbn2D) YODA::Bin1D<YODA::Dbn2D>;
+%feature("ignore") YODA::ProfileBin1D::operator=;
+%feature("ignore") YODA::Profile1D::operator=;
 %include "YODA/ProfileBin1D.h"
 %include "YODA/Profile1D.h"
 // %feature("ignore") std::vector<YODA::ProfileBin1D>::vector(size_type size);
@@ -90,6 +97,8 @@
 %ignore operator <=(const YODA::Point2D&, const YODA::Point2D&);
 %ignore operator >(const YODA::Point2D&, const YODA::Point2D&);
 %ignore operator >=(const YODA::Point2D&, const YODA::Point2D&);
+%feature("ignore") YODA::Point2D::operator=;
+%feature("ignore") YODA::Scatter2D::operator=;
 %include "YODA/Point2D.h"
 %include "YODA/Scatter2D.h"
 
@@ -99,6 +108,9 @@
 %ignore operator <=(const YODA::Point3D&, const YODA::Point3D&);
 %ignore operator >(const YODA::Point3D&, const YODA::Point3D&);
 %ignore operator >=(const YODA::Point3D&, const YODA::Point3D&);
+/// @todo Uncomment when these methods exist
+// %feature("ignore") YODA::Point3D::operator=;
+// %feature("ignore") YODA::Scatter3D::operator=;
 %include "YODA/Point3D.h"
 %include "YODA/Scatter3D.h"