misc fixes for 0.7

src/macros.jl

@@ -1078,8 +1078,13 @@ macro variable(args...)
             isexpr(_rng, :escape) ||
                 _error("Internal error 1")
             rng = _rng.args[1] # undo escaping
-            (isexpr(rng,:(:)) && rng.args[1] == 1 && length(rng.args) == 2) ||
-                _error("Index sets for SDP variables must be ranges of the form 1:N")
+            if VERSION >= v"0.7-"
+                (isexpr(rng,:call) && length(rng.args) == 3 && rng.args[1] == :(:) && rng.args[2] == 1) ||
+                    _error("Index sets for SDP variables must be ranges of the form 1:N")
+            else
+                (isexpr(rng,:(:)) && rng.args[1] == 1 && length(rng.args) == 2) ||
+                    _error("Index sets for SDP variables must be ranges of the form 1:N")
+            end
         end
 
         if !(lb == -Inf && ub == Inf)

src/operators.jl

@@ -593,7 +593,9 @@ end
 const op_hint = "Are you trying to build a nonlinear problem? Make sure you use @NLconstraint/@NLobjective."
 for (func,_) in Calculus.symbolic_derivatives_1arg(), typ in [:Variable,:AffExpr,:QuadExpr]
     errstr = "$func is not defined for type $typ. $op_hint"
-    @eval Base.$(func)(::$typ) = error($errstr)
+    if isdefined(Base, func)
+        @eval Base.$(func)(::$typ) = error($errstr)
+    end
 end
 
 *(::T,::S) where {T<:QuadExpr,S<:Union{Variable,AffExpr,QuadExpr}} =