[geos-commits] r3449 - in trunk: include/geos/geomgraph src/geomgraph

[svn_geos at osgeo.org]

Author: strk
Date: 2011-07-21 02:54:11 -0700 (Thu, 21 Jul 2011)
New Revision: 3449

Modified:
   trunk/include/geos/geomgraph/Label.h
   trunk/src/geomgraph/Label.cpp
Log:
Make geomgraph::Label non virtual, implement assignment operator, drop old logs, sync port info.

Modified: trunk/include/geos/geomgraph/Label.h
===================================================================
--- trunk/include/geos/geomgraph/Label.h	2011-07-21 09:54:02 UTC (rev 3448)
+++ trunk/include/geos/geomgraph/Label.h	2011-07-21 09:54:11 UTC (rev 3449)
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.refractions.net
@@ -14,7 +13,7 @@
  *
  **********************************************************************
  *
- * Last port: geomgraph/Label.java rev. 1.8 (JTS-1.10)
+ * Last port: geomgraph/Label.java r428 (JTS-1.12+)
  *
  **********************************************************************/
 
@@ -94,14 +93,13 @@
 	/// Copy ctor
 	Label(const Label &l);
 
+	Label& operator= (const Label& l);
+
 	/** \brief
 	 * Initialize the locations to Location::UNDEF
 	 */
 	Label();
 
-	/// I'd drop the 'virtual' modifier here --strk 2006-04-06
-	virtual ~Label();
-
 	/** \brief
 	 * Construct a Label with On, Left and Right locations for the
 	 * given Geometries.
@@ -157,7 +155,7 @@
 
 	std::string toString() const;
 
-protected:
+private:
 
 	TopologyLocation elt[2];
 };
@@ -174,16 +172,3 @@
 
 #endif // ifndef GEOS_GEOMGRAPH_LABEL_H
 
-/**********************************************************************
- * $Log$
- * Revision 1.3  2006/04/06 09:01:37  strk
- * Doxygen comments, port info, operator<<, assertion checking
- *
- * Revision 1.2  2006/03/24 09:52:41  strk
- * USE_INLINE => GEOS_INLINE
- *
- * Revision 1.1  2006/03/09 16:46:49  strk
- * geos::geom namespace definition, first pass at headers split
- *
- **********************************************************************/
-

Modified: trunk/src/geomgraph/Label.cpp
===================================================================
--- trunk/src/geomgraph/Label.cpp	2011-07-21 09:54:02 UTC (rev 3448)
+++ trunk/src/geomgraph/Label.cpp	2011-07-21 09:54:11 UTC (rev 3449)
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.refractions.net
@@ -14,7 +13,7 @@
  *
  **********************************************************************
  *
- * Last port: geomgraph/Label.java rev. 1.8 (JTS-1.10)
+ * Last port: geomgraph/Label.java r428 (JTS-1.12+)
  *
  **********************************************************************/
 
@@ -84,8 +83,12 @@
 }
 
 /*public*/
-Label::~Label()
+Label&
+Label::operator=(const Label &l)
 {
+	elt[0] = TopologyLocation(l.elt[0]);
+	elt[1] = TopologyLocation(l.elt[1]);
+	return *this;
 }
 
 /*public*/