Merge remote-tracking branch 'upstream/master'

1 files changed, 7 insertions, 0 deletions

diff --git a/klm/util/read_compressed.hh b/klm/util/read_compressed.hh
index 83ca9fb2..8b54c9e8 100644
--- a/klm/util/read_compressed.hh
+++ b/klm/util/read_compressed.hh
@@ -45,6 +45,10 @@ class ReadCompressed {
     // Takes ownership of fd.   
     explicit ReadCompressed(int fd);
 
+    // Try to avoid using this.  Use the fd instead.
+    // There is no decompression support for istreams.
+    explicit ReadCompressed(std::istream &in);
+
     // Must call Reset later.
     ReadCompressed();
 
@@ -53,6 +57,9 @@ class ReadCompressed {
     // Takes ownership of fd.  
     void Reset(int fd);
 
+    // Same advice as the constructor.
+    void Reset(std::istream &in);
+
     std::size_t Read(void *to, std::size_t amount);
 
     uint64_t RawAmount() const { return raw_amount_; }