2 files changed, 8 insertions, 8 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/or_blk.h b/gr-blocks/include/gnuradio/blocks/or_blk.h
index c263b30e46..12ebe5e538 100644
--- a/gr-blocks/include/gnuradio/blocks/or_blk.h
+++ b/gr-blocks/include/gnuradio/blocks/or_blk.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2012,2018 Free Software Foundation, Inc.
+ * Copyright 2012,2018,2020 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -13,6 +13,7 @@
 
 #include <gnuradio/blocks/api.h>
 #include <gnuradio/sync_block.h>
+#include <cstdint>
 
 namespace gr {
 namespace blocks {
@@ -33,9 +34,9 @@ public:
     static sptr make(size_t vlen = 1);
 };
 
-typedef or_blk<short> or_ss;
-typedef or_blk<int> or_ii;
-typedef or_blk<char> or_bb;
+typedef or_blk<std::uint8_t> or_bb;
+typedef or_blk<std::int16_t> or_ss;
+typedef or_blk<std::int32_t> or_ii;
 } /* namespace blocks */
 } /* namespace gr */
 
diff --git a/gr-blocks/lib/or_blk_impl.cc b/gr-blocks/lib/or_blk_impl.cc
index 528e85afc0..8505729fed 100644
--- a/gr-blocks/lib/or_blk_impl.cc
+++ b/gr-blocks/lib/or_blk_impl.cc
@@ -53,9 +53,8 @@ int or_blk_impl<T>::work(int noutput_items,
     return noutput_items;
 }
 
-template class or_blk<short>;
-template class or_blk<int>;
-template class or_blk<char>;
-
+template class or_blk<std::uint8_t>;
+template class or_blk<std::int16_t>;
+template class or_blk<std::int32_t>;
 } /* namespace blocks */
 } /* namespace gr */