aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jeff McGlynn <jwmcglynn@google.com>2018-07-06 17:31:43 -0700
committerGravatar Jeff McGlynn <jwmcglynn@google.com>2018-07-06 17:34:43 -0700
commit9281bf41acf975a739698999958b63cf8869855c (patch)
tree41fcce2347a46f615e77a41d7c1e4c2d0878f60e
parentb56a50064caf2a590ba43699e0074690fcd431bf (diff)
Fix compilation with mingw
On mingw, "IntType data_ = 0" fails to compile. Update to use IntType() instead. Change-Id: I706c15ddb993091aeb922ba7d9ef8cc4cc23bd64
-rw-r--r--src/base/bit_stream.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/bit_stream.h b/src/base/bit_stream.h
index c878197..2cda093 100644
--- a/src/base/bit_stream.h
+++ b/src/base/bit_stream.h
@@ -56,7 +56,7 @@ class BitStream {
data_size_ -= count;
return true;
} else {
- *result = 0;
+ *result = ResultType();
return false;
}
}
@@ -67,7 +67,7 @@ class BitStream {
: (IntType(1) << bits) - 1;
}
- IntType data_ = 0;
+ IntType data_ = IntType();
uint32_t data_size_ = 0;
};