[geos-commits] r2958 - in trunk/include/geos: geom geomgraph
index/strtree io noding operation operation/buffer
operation/linemerge operation/overlay operation/polygonize
planargraph simplify util
svn_geos at osgeo.org
svn_geos at osgeo.org
Mon Mar 29 07:29:42 EDT 2010
Author: mloskot
Date: 2010-03-29 07:29:40 -0400 (Mon, 29 Mar 2010)
New Revision: 2958
Modified:
trunk/include/geos/geom/Geometry.h
trunk/include/geos/geom/LineString.h
trunk/include/geos/geom/Point.h
trunk/include/geos/geomgraph/EdgeEndStar.h
trunk/include/geos/geomgraph/EdgeList.h
trunk/include/geos/geomgraph/Node.h
trunk/include/geos/geomgraph/NodeMap.h
trunk/include/geos/index/strtree/AbstractNode.h
trunk/include/geos/index/strtree/STRtree.h
trunk/include/geos/io/CLocalizer.h
trunk/include/geos/io/WKBReader.h
trunk/include/geos/io/WKTWriter.h
trunk/include/geos/noding/NodedSegmentString.h
trunk/include/geos/operation/GeometryGraphOperation.h
trunk/include/geos/operation/buffer/BufferBuilder.h
trunk/include/geos/operation/buffer/BufferOp.h
trunk/include/geos/operation/buffer/OffsetCurveBuilder.h
trunk/include/geos/operation/linemerge/LineMergeGraph.h
trunk/include/geos/operation/linemerge/LineMerger.h
trunk/include/geos/operation/overlay/OverlayOp.h
trunk/include/geos/operation/polygonize/Polygonizer.h
trunk/include/geos/planargraph/NodeMap.h
trunk/include/geos/planargraph/PlanarGraph.h
trunk/include/geos/simplify/LineSegmentIndex.h
trunk/include/geos/simplify/TaggedLineStringSimplifier.h
trunk/include/geos/simplify/TaggedLinesSimplifier.h
trunk/include/geos/simplify/TopologyPreservingSimplifier.h
trunk/include/geos/util/GEOSException.h
trunk/include/geos/util/GeometricShapeFactory.h
trunk/include/geos/util/UniqueCoordinateArrayFilter.h
Log:
Added pragma to disable Visual C++ warning C4251 - safe to ignore (http://support.microsoft.com/kb/813810/)
Modified: trunk/include/geos/geom/Geometry.h
===================================================================
--- trunk/include/geos/geom/Geometry.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/geom/Geometry.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -34,6 +34,12 @@
#include <vector>
#include <memory>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#pragma warning(disable: 4355) // warning C4355: 'this' : used in base member initializer list
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -796,8 +802,6 @@
private:
-
-
int getClassSortIndex() const;
class GeometryChangedFilter : public GeometryComponentFilter
@@ -847,6 +851,10 @@
} // namespace geos::geom
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#ifdef GEOS_INLINE
# include <geos/geom/Geometry.inl>
#endif
Modified: trunk/include/geos/geom/LineString.h
===================================================================
--- trunk/include/geos/geom/LineString.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/geom/LineString.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -34,6 +34,11 @@
#include <geos/inline.h>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
namespace geos {
namespace geom {
class Coordinate;
@@ -205,6 +210,10 @@
//# include "geos/geom/LineString.inl"
//#endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ndef GEOS_GEOS_LINESTRING_H
/**********************************************************************
Modified: trunk/include/geos/geom/Point.h
===================================================================
--- trunk/include/geos/geom/Point.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/geom/Point.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -34,6 +34,11 @@
#include <vector>
#include <memory> // for auto_ptr
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom { // geos::geom
@@ -163,5 +168,9 @@
//# include "geos/geom/Point.inl"
//#endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ndef GEOS_GEOS_POINT_H
Modified: trunk/include/geos/geomgraph/EdgeEndStar.h
===================================================================
--- trunk/include/geos/geomgraph/EdgeEndStar.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/geomgraph/EdgeEndStar.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -33,6 +33,11 @@
#include <vector>
#include <algorithm> // for inlines (find)
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace algorithm {
@@ -190,6 +195,10 @@
//# include "geos/geomgraph/EdgeEndStar.inl"
//#endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ifndef GEOS_GEOMGRAPH_EDGEENDSTAR_H
/**********************************************************************
Modified: trunk/include/geos/geomgraph/EdgeList.h
===================================================================
--- trunk/include/geos/geomgraph/EdgeList.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/geomgraph/EdgeList.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -32,6 +32,11 @@
#include <geos/inline.h>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace index {
@@ -119,6 +124,10 @@
//# include "geos/geomgraph/EdgeList.inl"
//#endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ifndef GEOS_GEOMGRAPH_EDGELIST_H
/**********************************************************************
Modified: trunk/include/geos/geomgraph/Node.h
===================================================================
--- trunk/include/geos/geomgraph/Node.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/geomgraph/Node.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -36,6 +36,11 @@
#include <cassert>
#include <string>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -188,6 +193,10 @@
//# include "geos/geomgraph/Node.inl"
//#endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ifndef GEOS_GEOMGRAPH_NODE_H
/**********************************************************************
Modified: trunk/include/geos/geomgraph/NodeMap.h
===================================================================
--- trunk/include/geos/geomgraph/NodeMap.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/geomgraph/NodeMap.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -32,6 +32,11 @@
#include <geos/inline.h>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geomgraph {
@@ -117,6 +122,10 @@
//# include "geos/geomgraph/NodeMap.inl"
//#endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ifndef GEOS_GEOMGRAPH_NODEMAP_H
/**********************************************************************
Modified: trunk/include/geos/index/strtree/AbstractNode.h
===================================================================
--- trunk/include/geos/index/strtree/AbstractNode.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/index/strtree/AbstractNode.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -21,6 +21,11 @@
#include <vector>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
namespace geos {
namespace index { // geos::index
namespace strtree { // geos::index::strtree
@@ -85,6 +90,10 @@
} // namespace geos::index
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_INDEX_STRTREE_ABSTRACTNODE_H
/**********************************************************************
Modified: trunk/include/geos/index/strtree/STRtree.h
===================================================================
--- trunk/include/geos/index/strtree/STRtree.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/index/strtree/STRtree.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -28,6 +28,11 @@
#include <vector>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace index {
@@ -144,6 +149,11 @@
} // namespace geos::index
} // namespace geos
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_INDEX_STRTREE_STRTREE_H
/**********************************************************************
Modified: trunk/include/geos/io/CLocalizer.h
===================================================================
--- trunk/include/geos/io/CLocalizer.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/io/CLocalizer.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -21,6 +21,11 @@
#include <string>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
namespace geos {
namespace io {
@@ -39,6 +44,10 @@
std::string saved_locale;
};
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
} // namespace io
} // namespace geos
Modified: trunk/include/geos/io/WKBReader.h
===================================================================
--- trunk/include/geos/io/WKBReader.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/io/WKBReader.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -32,6 +32,10 @@
#define BAD_GEOM_TYPE_MSG "Bad geometry type encountered in"
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
// Forward declarations
namespace geos {
@@ -162,6 +166,9 @@
} // namespace io
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
#endif // #ifndef GEOS_IO_WKBREADER_H
Modified: trunk/include/geos/io/WKTWriter.h
===================================================================
--- trunk/include/geos/io/WKTWriter.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/io/WKTWriter.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -25,6 +25,11 @@
#include <string>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -213,6 +218,10 @@
} // namespace geos::io
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // #ifndef GEOS_IO_WKTWRITER_H
/**********************************************************************
Modified: trunk/include/geos/noding/NodedSegmentString.h
===================================================================
--- trunk/include/geos/noding/NodedSegmentString.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/noding/NodedSegmentString.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -34,7 +34,7 @@
#ifdef _MSC_VER
#pragma warning(push)
-#pragma warning(disable: 4355) // warning C4355: 'this' : used in base member initializer list
+#pragma warning(disable: 4251 4355) // warning C4355: 'this' : used in base member initializer list
#endif
namespace geos {
Modified: trunk/include/geos/operation/GeometryGraphOperation.h
===================================================================
--- trunk/include/geos/operation/GeometryGraphOperation.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/operation/GeometryGraphOperation.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -26,6 +26,11 @@
#include <vector>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace algorithm {
@@ -79,8 +84,12 @@
} // namespace geos.operation
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
#endif
+#endif
+
/**********************************************************************
* $Log$
* Revision 1.2 2006/04/03 15:54:33 strk
Modified: trunk/include/geos/operation/buffer/BufferBuilder.h
===================================================================
--- trunk/include/geos/operation/buffer/BufferBuilder.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/operation/buffer/BufferBuilder.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -29,6 +29,11 @@
#include <geos/operation/buffer/OffsetCurveBuilder.h> // for inline (OffsetCurveBuilder enums)
#include <geos/geomgraph/EdgeList.h> // for composition
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -220,6 +225,10 @@
} // namespace geos::operation
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ndef GEOS_OP_BUFFER_BUFFERBUILDER_H
/**********************************************************************
Modified: trunk/include/geos/operation/buffer/BufferOp.h
===================================================================
--- trunk/include/geos/operation/buffer/BufferOp.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/operation/buffer/BufferOp.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -22,11 +22,16 @@
#ifndef GEOS_OP_BUFFER_BUFFEROP_H
#define GEOS_OP_BUFFER_BUFFEROP_H
-#include <geos/export.h>//#include <geos/operation/buffer/OffsetCurveBuilder.h> // for enum values
+#include <geos/export.h>
#include <geos/operation/buffer/BufferParameters.h> // for enum values
#include <geos/util/TopologyException.h> // for composition
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -229,11 +234,14 @@
bufParams.setEndCapStyle((BufferParameters::EndCapStyle)s);
}
-
} // namespace geos::operation::buffer
} // namespace geos::operation
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ndef GEOS_OP_BUFFER_BUFFEROP_H
/**********************************************************************
Modified: trunk/include/geos/operation/buffer/OffsetCurveBuilder.h
===================================================================
--- trunk/include/geos/operation/buffer/OffsetCurveBuilder.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/operation/buffer/OffsetCurveBuilder.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -30,6 +30,11 @@
#include <geos/geom/LineSegment.h> // for composition
#include <geos/operation/buffer/BufferParameters.h> // for composition
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -368,6 +373,10 @@
} // namespace geos::operation
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ndef GEOS_OP_BUFFER_OFFSETCURVEBUILDER_H
/**********************************************************************
Modified: trunk/include/geos/operation/linemerge/LineMergeGraph.h
===================================================================
--- trunk/include/geos/operation/linemerge/LineMergeGraph.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/operation/linemerge/LineMergeGraph.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -21,11 +21,15 @@
#define GEOS_OP_LINEMERGE_LINEMERGEGRAPH_H
#include <geos/export.h>
-
#include <geos/planargraph/PlanarGraph.h> // for inheritance
#include <vector>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -77,6 +81,10 @@
} // namespace geos::operation
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_OP_LINEMERGE_LINEMERGEGRAPH_H
/**********************************************************************
Modified: trunk/include/geos/operation/linemerge/LineMerger.h
===================================================================
--- trunk/include/geos/operation/linemerge/LineMerger.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/operation/linemerge/LineMerger.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -21,11 +21,15 @@
#define GEOS_OP_LINEMERGE_LINEMERGER_H
#include <geos/export.h>
-
#include <geos/operation/linemerge/LineMergeGraph.h> // for composition
#include <vector>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -134,6 +138,10 @@
} // namespace geos::operation
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_OP_LINEMERGE_LINEMERGER_H
/**********************************************************************
Modified: trunk/include/geos/operation/overlay/OverlayOp.h
===================================================================
--- trunk/include/geos/operation/overlay/OverlayOp.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/operation/overlay/OverlayOp.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -29,6 +29,11 @@
#include <vector>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -350,6 +355,10 @@
} // namespace geos::operation
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // ndef GEOS_OP_OVERLAY_OVERLAYOP_H
/**********************************************************************
Modified: trunk/include/geos/operation/polygonize/Polygonizer.h
===================================================================
--- trunk/include/geos/operation/polygonize/Polygonizer.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/operation/polygonize/Polygonizer.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -19,16 +19,19 @@
*
**********************************************************************/
-
#ifndef GEOS_OP_POLYGONIZE_POLYGONIZER_H
#define GEOS_OP_POLYGONIZE_POLYGONIZER_H
#include <geos/export.h>
-
#include <geos/geom/GeometryComponentFilter.h> // for LineStringAdder inheritance
#include <vector>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -217,6 +220,10 @@
} // namespace geos::operation
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_OP_POLYGONIZE_POLYGONIZER_H
/**********************************************************************
Modified: trunk/include/geos/planargraph/NodeMap.h
===================================================================
--- trunk/include/geos/planargraph/NodeMap.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/planargraph/NodeMap.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -23,6 +23,11 @@
#include <map>
#include <vector>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace planargraph {
@@ -116,6 +121,10 @@
} // namespace geos::planargraph
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_PLANARGRAPH_NODEMAP_H
/**********************************************************************
Modified: trunk/include/geos/planargraph/PlanarGraph.h
===================================================================
--- trunk/include/geos/planargraph/PlanarGraph.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/planargraph/PlanarGraph.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -21,6 +21,11 @@
#include <vector> // for typedefs
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -231,6 +236,10 @@
} // namespace geos::planargraph
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_PLANARGRAPH_PLANARGRAPH_H
/**********************************************************************
Modified: trunk/include/geos/simplify/LineSegmentIndex.h
===================================================================
--- trunk/include/geos/simplify/LineSegmentIndex.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/simplify/LineSegmentIndex.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -28,6 +28,11 @@
#include <vector>
#include <memory> // for auto_ptr
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -78,6 +83,10 @@
} // namespace geos::simplify
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_SIMPLIFY_LINESEGMENTINDEX_H
/**********************************************************************
Modified: trunk/include/geos/simplify/TaggedLineStringSimplifier.h
===================================================================
--- trunk/include/geos/simplify/TaggedLineStringSimplifier.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/simplify/TaggedLineStringSimplifier.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -26,9 +26,15 @@
#define GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H
#include <geos/export.h>
+#include <cstddef>
#include <vector>
#include <memory>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace algorithm {
@@ -92,20 +98,20 @@
double distanceTolerance;
- void simplifySection(size_t i, size_t j,
- size_t depth);
+ void simplifySection(std::size_t i, std::size_t j,
+ std::size_t depth);
- static size_t findFurthestPoint(
+ static std::size_t findFurthestPoint(
const geom::CoordinateSequence* pts,
- size_t i, size_t j,
+ std::size_t i, std::size_t j,
double& maxDistance);
bool hasBadIntersection(const TaggedLineString* parentLine,
- const std::vector<size_t>& sectionIndex,
+ const std::vector<std::size_t>& sectionIndex,
const geom::LineSegment& candidateSeg);
bool hasBadInputIntersection(const TaggedLineString* parentLine,
- const std::vector<size_t>& sectionIndex,
+ const std::vector<std::size_t>& sectionIndex,
const geom::LineSegment& candidateSeg);
bool hasBadOutputIntersection(const geom::LineSegment& candidateSeg);
@@ -114,7 +120,7 @@
const geom::LineSegment& seg1) const;
std::auto_ptr<TaggedLineSegment> flatten(
- size_t start, size_t end);
+ std::size_t start, std::size_t end);
/** \brief
* Tests whether a segment is in a section of a TaggedLineString
@@ -126,7 +132,7 @@
*/
static bool isInLineSection(
const TaggedLineString* parentLine,
- const std::vector<size_t>& sectionIndex,
+ const std::vector<std::size_t>& sectionIndex,
const TaggedLineSegment* seg);
/** \brief
@@ -138,8 +144,8 @@
* @param sectionEndIndex
*/
void remove(const TaggedLineString* line,
- size_t start,
- size_t end);
+ std::size_t start,
+ std::size_t end);
};
@@ -152,6 +158,10 @@
} // namespace geos::simplify
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H
/**********************************************************************
Modified: trunk/include/geos/simplify/TaggedLinesSimplifier.h
===================================================================
--- trunk/include/geos/simplify/TaggedLinesSimplifier.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/simplify/TaggedLinesSimplifier.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -35,6 +35,11 @@
#include <geos/simplify/LineSegmentIndex.h> // for templated function body
#include <geos/simplify/TaggedLineStringSimplifier.h>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace simplify {
@@ -106,13 +111,15 @@
std::auto_ptr<LineSegmentIndex> outputIndex;
std::auto_ptr<TaggedLineStringSimplifier> taggedlineSimplifier;
-
};
-
} // namespace geos::simplify
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_SIMPLIFY_TAGGEDLINESSIMPLIFIER_H
/**********************************************************************
Modified: trunk/include/geos/simplify/TopologyPreservingSimplifier.h
===================================================================
--- trunk/include/geos/simplify/TopologyPreservingSimplifier.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/simplify/TopologyPreservingSimplifier.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -30,6 +30,11 @@
#include <memory> // for auto_ptr
#include <map>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
namespace geos {
namespace simplify { // geos::simplify
@@ -87,6 +92,10 @@
} // namespace geos::simplify
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_SIMPLIFY_TOPOLOGYPRESERVINGSIMPLIFIER_H
/**********************************************************************
Modified: trunk/include/geos/util/GEOSException.h
===================================================================
--- trunk/include/geos/util/GEOSException.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/util/GEOSException.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -21,6 +21,11 @@
#include <stdexcept>
#include <string>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
namespace geos {
namespace util { // geos.util
@@ -65,6 +70,10 @@
} // namespace geos.util
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_UTIL_GEOSEXCEPTION_H
/**********************************************************************
Modified: trunk/include/geos/util/GeometricShapeFactory.h
===================================================================
--- trunk/include/geos/util/GeometricShapeFactory.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/util/GeometricShapeFactory.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -27,6 +27,11 @@
#include <geos/geom/Coordinate.h>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
// Forward declarations
namespace geos {
namespace geom {
@@ -189,6 +194,10 @@
} // namespace geos::util
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_UTIL_GEOMETRICSHAPEFACTORY_H
/**********************************************************************
Modified: trunk/include/geos/util/UniqueCoordinateArrayFilter.h
===================================================================
--- trunk/include/geos/util/UniqueCoordinateArrayFilter.h 2010-03-29 11:21:06 UTC (rev 2957)
+++ trunk/include/geos/util/UniqueCoordinateArrayFilter.h 2010-03-29 11:29:40 UTC (rev 2958)
@@ -26,6 +26,11 @@
#include <geos/geom/CoordinateSequence.h>
#include <geos/geom/Coordinate.h>
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
namespace geos {
namespace util { // geos::util
@@ -80,6 +85,10 @@
} // namespace geos::util
} // namespace geos
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
#endif // GEOS_UTIL_UNIQUECOORDINATEARRAYFILTER_H
/**********************************************************************
More information about the geos-commits
mailing list