Changeset 3372


Ignore:
Timestamp:
May 19, 2011, 12:32:06 PM (13 years ago)
Author:
warmerdam
Message:

Updates for Makefile.vc builds and issues when building NDEBUG and no inlining

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/geos/noding/SegmentPointComparator.h

    r3255 r3372  
    2222#include <geos/export.h>
    2323#include <geos/geom/Coordinate.h>
     24#include <cassert>
    2425
    2526namespace geos {

  • trunk/src/Makefile.vc

    r2950 r3372  
    8787        geom\util\GeometryCombiner.$(EXT) \
    8888        geom\util\ShortCircuitedGeometryVisitor.$(EXT) \
     89        geom\util\SineStarFactory.$(EXT) \
    8990        geom\prep\AbstractPreparedPolygonContains.$(EXT) \
    9091        geom\prep\BasicPreparedGeometry.$(EXT) \
    … …  
    106107        geomgraph\EdgeEnd.$(EXT) \
    107108        geomgraph\EdgeEndStar.$(EXT) \
    108         geomgraph\EdgeIntersection.$(EXT) \
    109109        geomgraph\EdgeIntersectionList.$(EXT) \
    110110        geomgraph\EdgeList.$(EXT) \
    … …  
    203203        operation\buffer\OffsetCurveBuilder.$(EXT) \
    204204        operation\buffer\OffsetCurveSetBuilder.$(EXT) \
     205        operation\buffer\OffsetSegmentGenerator.$(EXT) \
    205206        operation\buffer\RightmostEdgeFinder.$(EXT) \
    206207        operation\buffer\SubgraphDepthLocater.$(EXT) \
    … …  
    248249        operation\relate\RelateNodeGraph.$(EXT) \
    249250        operation\relate\RelateOp.$(EXT) \
     251        operation\sharedpaths\SharedPathsOp.$(EXT) \
    250252        operation\union\CascadedPolygonUnion.$(EXT) \
     253        operation\union\CascadedUnion.$(EXT) \
     254        operation\union\PointGeometryUnion.$(EXT) \
     255        operation\union\UnaryUnionOp.$(EXT) \
    251256        operation\valid\ConnectedInteriorTester.$(EXT) \
    252257        operation\valid\ConsistentAreaTester.$(EXT) \

  • trunk/src/noding/snapround/MCIndexSnapRounder.cpp

    r3238 r3372  
    3232#include <vector>
    3333
    34 
    35 #ifndef GEOS_INLINE
    36 # include <geos/noding/snapround/MCIndexSnapRounder.inl>
    37 #endif
    3834
    3935using namespace std;

  • trunk/src/operation/overlay/PolygonBuilder.cpp

    r3286 r3372  
    245245                }
    246246        }
     247
     248#ifndef NDEBUG
    247249        if ( shellCount > 1 ) {
    248250                throw util::TopologyException("found two shells in MinimalEdgeRing list");
    249251        }
     252#endif
     253
    250254        return shell;
    251255}
Note: See TracChangeset for help on using the changeset viewer.