remove unneccesary compat calls

Author: visr

deps/build.jl

@@ -2,7 +2,7 @@ using BinDeps, Compat
 @BinDeps.setup
 
 libgeos = library_dependency("libgeos",aliases=["libgeos_c", "libgeos_c-1"], validate = function(path, handle)
-    return @compat(Libdl.dlsym_e(handle,:initGEOS)) != C_NULL && @compat(Libdl.dlsym_e(handle,:GEOSDelaunayTriangulation)) != C_NULL
+    return Libdl.dlsym_e(handle,:initGEOS) != C_NULL && Libdl.dlsym_e(handle,:GEOSDelaunayTriangulation) != C_NULL
 end)
 
 version = "3.4.2"
@@ -13,19 +13,19 @@ provides(BuildProcess,Autotools(libtarget = "capi/.libs/libgeos_c."*BinDeps.shli
 # TODO: provides(Yum,"libgeos-dev", libgeos)
 # TODO: provides(Pacman,"libgeos-dev", libgeos)
 
-@windows_only begin
+if is_windows()
     using WinRPM
     push!(WinRPM.sources, "http://download.opensuse.org/repositories/home:yeesian/openSUSE_13.2")
     WinRPM.update()
     provides(WinRPM.RPM, "libgeos", [libgeos], os = :Windows)
 end
 
-@osx_only begin
+if is_apple()
     if Pkg.installed("Homebrew") === nothing
         error("Homebrew package not installed, please run Pkg.add(\"Homebrew\")")
     end
     using Homebrew
     provides(Homebrew.HB, "geos", libgeos, os = :Darwin)
 end
 
-@BinDeps.install @compat Dict(:libgeos => :libgeos)
+@BinDeps.install Dict(:libgeos => :libgeos)

src/geos_functions.jl

@@ -5,14 +5,14 @@
 #   GEOSGeom objects to avoid memory leaks, and to GEOSFree()
 #   all returned char * (unless const).
 
-GEOMTYPE = @compat Dict( GEOS_POINT => :Point,
-                         GEOS_LINESTRING => :LineString,
-                         GEOS_LINEARRING => :LinearRing,
-                         GEOS_POLYGON => :Polygon,
-                         GEOS_MULTIPOINT => :MultiPoint,
-                         GEOS_MULTILINESTRING => :MultiLineString,
-                         GEOS_MULTIPOLYGON => :MultiPolygon,
-                         GEOS_GEOMETRYCOLLECTION => :GeometryCollection)
+GEOMTYPE = Dict( GEOS_POINT => :Point,
+                 GEOS_LINESTRING => :LineString,
+                 GEOS_LINEARRING => :LinearRing,
+                 GEOS_POLYGON => :Polygon,
+                 GEOS_MULTIPOINT => :MultiPoint,
+                 GEOS_MULTILINESTRING => :MultiLineString,
+                 GEOS_MULTIPOLYGON => :MultiPolygon,
+                 GEOS_GEOMETRYCOLLECTION => :GeometryCollection)
 
 
 function geomFromWKT(geom::Compat.ASCIIString)
@@ -22,7 +22,7 @@ function geomFromWKT(geom::Compat.ASCIIString)
     end
     result
 end
-geomToWKT(geom::Ptr{GEOSGeometry}) = Compat.unsafe_string(GEOSGeomToWKT(geom))
+geomToWKT(geom::Ptr{GEOSGeometry}) = unsafe_string(GEOSGeomToWKT(geom))
 
 # -----
 # Coordinate Sequence functions
@@ -113,7 +113,7 @@ let out = Array(UInt32, 1)
         if result == 0
             error("LibGEOS: Error in GEOSCoordSeq_getSize")
         end
-        @compat Int(out[1])
+        Int(out[1])
     end
 end
 
@@ -125,7 +125,7 @@ let out = Array(UInt32, 1)
         if result == 0
             error("LibGEOS: Error in GEOSCoordSeq_getDimensions")
         end
-        @compat Int(out[1])
+        Int(out[1])
     end
 end
 
@@ -288,7 +288,7 @@ end
 # The user can control the accuracy of the curve approximation by specifying the number of linear segments with which to approximate a curve.
 
 # Always returns a polygon. The negative or zero-distance buffer of lines and points is always an empty Polygon.
-buffer(ptr::GEOSGeom, width::Real, quadsegs::Integer=8) = GEOSBuffer(ptr, width, @compat(Int32(quadsegs)))
+buffer(ptr::GEOSGeom, width::Real, quadsegs::Integer=8) = GEOSBuffer(ptr, width, Int32(quadsegs))
 
 # enum GEOSBufCapStyles
 # enum GEOSBufJoinStyles
@@ -552,7 +552,7 @@ end
 #
 # @return  a newly allocated geometry, or NULL on exception
 function delaunayTriangulation(ptr::GEOSGeom, tol::Real=0.0, onlyEdges::Bool=false)
-    result = GEOSDelaunayTriangulation(ptr, tol, @compat(Int32(onlyEdges)))
+    result = GEOSDelaunayTriangulation(ptr, tol, Int32(onlyEdges))
     if result == C_NULL
         error("LibGEOS: Error in GEOSDelaunayTriangulation")
     end

src/geos_operations.jl

@@ -278,7 +278,7 @@ isClosed(obj::LineString) = isClosed(obj.ptr) # Call only on LINESTRING
 # # Up to GEOS 3.2.0 the input geometry must be a Collection, in
 # # later version it doesn't matter (i.e. getGeometryN(0) for a single will return the input).
 # function getGeometry(ptr::GEOSGeom, n::Integer)
-#     result = GEOSGetGeometryN(ptr, @compat(Int32(n-1)))
+#     result = GEOSGetGeometryN(ptr, Int32(n-1))
 #     if result == C_NULL
 #         error("LibGEOS: Error in GEOSGetGeometryN")
 #     end
@@ -344,7 +344,7 @@ exteriorRing(obj::Polygon) = LinearRing(exteriorRing(obj.ptr))
 
 # # Call only on LINESTRING, and must be freed by caller (Returns NULL on exception)
 # function getPoint(ptr::GEOSGeom, n::Integer)
-#     result = GEOSGeomGetPointN(ptr, @compat(Int32(n-1)))
+#     result = GEOSGeomGetPointN(ptr, Int32(n-1))
 #     if result == C_NULL
 #         error("LibGEOS: Error in GEOSGeomGetPointN")
 #     end
@@ -386,4 +386,3 @@ for g1 in (:Point, :MultiPoint, :LineString, :MultiLineString, :LinearRing, :Pol
         end
     end
 end
-