From e0ef6eea640dc6fed0094fc5265bdf529bd5175b Mon Sep 17 00:00:00 2001
From: Jon Trulson <jtrulson@ics.com>
Date: Thu, 7 Jul 2016 17:43:21 -0600
Subject: [PATCH] ozw: fix up some issues reported by static analysis

Signed-off-by: Jon Trulson <jtrulson@ics.com>
---
 src/ozw/ozw.hpp    | 4 ++--
 src/ozw/zwNode.cxx | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ozw/ozw.hpp b/src/ozw/ozw.hpp
index e8ad57bf..78d9188b 100644
--- a/src/ozw/ozw.hpp
+++ b/src/ozw/ozw.hpp
@@ -576,8 +576,8 @@ namespace upm {
 
   private:
     // prevent copying and assignment
-    OZW(OZW const &) {};
-    OZW& operator=(OZW const&) {};
+    OZW(OZW const &) = delete;
+    OZW& operator=(OZW const&) = delete;
 
     // our class instance
     static OZW* m_instance;
diff --git a/src/ozw/zwNode.cxx b/src/ozw/zwNode.cxx
index 2ce1208a..0959eded 100644
--- a/src/ozw/zwNode.cxx
+++ b/src/ozw/zwNode.cxx
@@ -24,6 +24,8 @@
 
 #include <stdint.h>
 #include <string>
+#include <cinttypes>
+
 #include "zwNode.hpp"
 
 #include "Node.h"
@@ -185,7 +187,7 @@ void zwNode::dumpNode(bool all)
                   valueUnits.c_str(),
                   perms.c_str());
 
-          fprintf(stderr, "\t\t VID: %016x\n",
+          fprintf(stderr, "\t\t VID: %016" PRIx64 "\n",
                   vid.GetId());
         }
     }