From c6ba90ba1ca606b63373caaba16cb4fcc65d00f9 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Mon, 9 Jan 2017 18:30:29 +0100
Subject: Remove unused inttypes
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
NitrokeyManager.cc | 2 +-
include/CommandFailedException.h | 2 +-
include/command_id.h | 2 +-
include/device.h | 2 +-
include/device_proto.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index ddec600..c49a449 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -84,7 +84,7 @@ namespace nitrokey{
shared_ptr<NitrokeyManager> NitrokeyManager::instance() {
if (_instance == nullptr){
- _instance = shared_ptr<NitrokeyManager>(new NitrokeyManager());
+ _instance = make_shared<NitrokeyManager>();
}
return _instance;
}
diff --git a/include/CommandFailedException.h b/include/CommandFailedException.h
index 9b0c59e..8bcdcae 100644
--- a/include/CommandFailedException.h
+++ b/include/CommandFailedException.h
@@ -7,7 +7,7 @@
#include <exception>
#include <cstdint>
-#include <log.h>
+#include "log.h"
class CommandFailedException : public std::exception {
public:
diff --git a/include/command_id.h b/include/command_id.h
index 346b750..9d12f93 100644
--- a/include/command_id.h
+++ b/include/command_id.h
@@ -1,6 +1,6 @@
#ifndef COMMAND_ID_H
#define COMMAND_ID_H
-#include "inttypes.h"
+#include <stdint.h>
namespace nitrokey {
namespace proto {
diff --git a/include/device.h b/include/device.h
index 62c4073..f686fbd 100644
--- a/include/device.h
+++ b/include/device.h
@@ -2,7 +2,7 @@
#define DEVICE_H
#include <chrono>
#include <hidapi/hidapi.h>
-#include "inttypes.h"
+#include <stdint.h>
#define HID_REPORT_SIZE 65
diff --git a/include/device_proto.h b/include/device_proto.h
index 0953566..667b8db 100644
--- a/include/device_proto.h
+++ b/include/device_proto.h
@@ -8,7 +8,7 @@
#include <string>
#include <strings.h>
// a local version for compatibility with Windows
-#include "inttypes.h"
+#include <stdint.h>
#include "cxx_semantics.h"
#include "device.h"
#include "misc.h"
--
cgit v1.2.3