3 files changed, 12 insertions, 11 deletions
diff --git a/examples/iochannel_stream/fdstream.cc b/examples/iochannel_stream/fdstream.cc
index be97676f..3764546a 100644
--- a/examples/iochannel_stream/fdstream.cc
+++ b/examples/iochannel_stream/fdstream.cc
@@ -265,7 +265,8 @@ std::streamsize fdstreambuf::xsgetn(char* dest, std::streamsize num)
 	  *putback_buffer = *(gptr() - 1);
 	  putback_count = 2;
 	}
-	else putback_count = 1;
+	else
+          putback_count = 1;
       }
 
       *(putback_buffer + 1) = *(dest + (chars_read - 1));
@@ -280,8 +281,8 @@ std::streamsize fdstreambuf::xsgetn(char* dest, std::streamsize num)
 }
 
 fdstream::fdstream(int fd, bool manage)
-: std::istream(0),
-  std::ostream(0),
+: std::istream(nullptr),
+  std::ostream(nullptr),
   buf(fd, manage)
 {
   std::istream::rdbuf(&buf);
@@ -289,8 +290,8 @@ fdstream::fdstream(int fd, bool manage)
 }
 
 fdstream::fdstream()
-: std::istream(0),
-  std::ostream(0)
+: std::istream(nullptr),
+  std::ostream(nullptr)
 {
   std::istream::rdbuf(&buf);
   std::ostream::rdbuf(&buf);
diff --git a/examples/iochannel_stream/fdstream.h b/examples/iochannel_stream/fdstream.h
index 8c7f45dc..80f46757 100644
--- a/examples/iochannel_stream/fdstream.h
+++ b/examples/iochannel_stream/fdstream.h
@@ -77,11 +77,11 @@ public:
   fdstream_error get_error() const;
 
 protected:
-  virtual int_type underflow();
-  virtual std::streamsize xsgetn(char* dest, std::streamsize num);
-  virtual int sync();
-  virtual int_type overflow(int_type c);
-  virtual std::streamsize xsputn(const char* source, std::streamsize num);
+  int_type underflow() override;
+  std::streamsize xsgetn(char* dest, std::streamsize num) override;
+  int sync() override;
+  int_type overflow(int_type c) override;
+  std::streamsize xsputn(const char* source, std::streamsize num) override;
 
 private:
   Glib::RefPtr<Glib::IOChannel> iochannel_;
diff --git a/examples/iochannel_stream/main.cc b/examples/iochannel_stream/main.cc
index aaebbdda..e2e670f0 100644
--- a/examples/iochannel_stream/main.cc
+++ b/examples/iochannel_stream/main.cc
@@ -81,7 +81,7 @@ int main( /* int argc, char *argv[] */)
     }
   }
  
-  int read_fd = open("testfifo", O_RDONLY);
+  const auto read_fd = open("testfifo", O_RDONLY);
   if(read_fd == -1)
   {
     std::cerr << "error opening fifo" << std::endl;