Integral Types

tests/render_score.cpp

@@ -12,7 +12,7 @@
 namespace {
 class score_view final : public luma::control {
 public:
-  score_view(luma::application& app, vamp_zero::score_document score, std::string output, std::size_t page, bool& saved)
+  score_view(luma::application& app, vamp_zero::score_document score, std::string output, std::size_t page, std::bool_t& saved)
     : app_{app}, score_{std::move(score)}, output_{std::move(output)}, page_{page}, saved_{saved} {}
   auto measure(luma::draw_context&, luma::theme const&, luma::constraints) -> luma::size override { return {976,484}; }
   auto draw(luma::draw_context& context, luma::theme const&) const -> void override {
@@ -28,18 +28,18 @@ private:
   vamp_zero::score_document score_;
   std::string output_;
   std::size_t page_;
-  bool& saved_;
+  std::bool_t& saved_;
 };
 }
 
-int main(int argc, char** argv) {
+int main(int argc, std::char_t** argv) {
   if (argc < 3) { std::cerr << "Usage: vamp-render-score input.json output.png [page]\n"; return 2; }
   auto input = std::ifstream{argv[1]};
-  auto json = std::string{std::istreambuf_iterator<char>{input},std::istreambuf_iterator<char>{}};
+  auto json = std::string{std::istreambuf_iterator<std::char_t>{input},std::istreambuf_iterator<std::char_t>{}};
   auto score = vamp_zero::parse_score_document(json,argv[1]);
   if (!score) { std::cerr << score.error().describe() << '\n'; return 1; }
   auto app = luma::application{{.title="Notation Regression",.display={.width=976,.height=484,.target_fps=30,.fullscreen=false}}};
-  auto saved = false;
+  auto saved = std::bool_t{false};
   auto root = app.set_root(std::make_unique<score_view>(app,std::move(*score),argv[2],argc>3 ? std::stoul(argv[3]) : 0,saved));
   if (!root) return 1;
   auto ran = app.run();