update apd

cockroachdb · Aug 6, 2018 · d5cea79 · d5cea79
1 parent 8ac6cac
commit d5cea79
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/github.com/cockroachdb/apd/.travis.yml b/github.com/cockroachdb/apd/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.8.x
   - 1.9.x
+  - 1.10.x
 
 script: go test
diff --git a/github.com/cockroachdb/apd/context.go b/github.com/cockroachdb/apd/context.go
@@ -182,12 +182,7 @@ func (c *Context) Neg(d, x *Decimal) (Condition, error) {
 	if set, res, err := c.setIfNaN(d, x); set {
 		return res, err
 	}
-	if x.IsZero() {
-		d.Set(x)
-		d.Negative = false
-	} else {
-		d.Neg(x)
-	}
+	d.Neg(x)
 	return c.Round(d, d)
 }
 

diff --git a/github.com/cockroachdb/apd/decimal.go b/github.com/cockroachdb/apd/decimal.go
@@ -684,7 +684,11 @@ func (d *Decimal) Modf(integ, frac *Decimal) {
 // Neg sets d to -x and returns d.
 func (d *Decimal) Neg(x *Decimal) *Decimal {
 	d.Set(x)
-	d.Negative = !d.Negative
+	if d.IsZero() {
+		d.Negative = false
+	} else {
+		d.Negative = !d.Negative
+	}
 	return d
 }