From ac4a9f30785c0d80ea0ba50229c848073cdb0ca7 Mon Sep 17 00:00:00 2001
From: Lais Frigerio <lfs@inf.ufpr.br>
Date: Tue, 11 Oct 2016 10:32:21 -0300
Subject: [PATCH] Update #includes on .cpp and .h

---
 include/agent/linux/get_distro.h       | 2 +-
 include/agent/linux/get_macaddr.h      | 2 +-
 include/agent/linux/get_machine_type.h | 3 +--
 include/agent/linux/get_user_count.h   | 2 +-
 include/agent/linux/inventory.h        | 1 -
 src/linux/get_date.cpp                 | 1 -
 src/linux/get_distro.cpp               | 1 -
 src/linux/get_macaddr.cpp              | 1 -
 src/linux/get_machine_type.cpp         | 1 -
 src/linux/get_time.cpp                 | 1 -
 src/linux/get_user_count.cpp           | 1 -
 src/linux/inventory.cpp                | 1 -
 12 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/include/agent/linux/get_distro.h b/include/agent/linux/get_distro.h
index 9abcb256..ae5556a3 100644
--- a/include/agent/linux/get_distro.h
+++ b/include/agent/linux/get_distro.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <sys/utsname.h>
 #include <fstream>
-#include <string>
+#include <cstring>
 
 int open_file(std::string name, std::ifstream& fstream);
 std::string get_distro();
diff --git a/include/agent/linux/get_macaddr.h b/include/agent/linux/get_macaddr.h
index 36144c11..fe29987e 100644
--- a/include/agent/linux/get_macaddr.h
+++ b/include/agent/linux/get_macaddr.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <fstream>
 #include <iostream>
-#include <string>
+#include <cstring>
 
 std::string get_macaddr();
diff --git a/include/agent/linux/get_machine_type.h b/include/agent/linux/get_machine_type.h
index fdd2b4ee..a787fa04 100644
--- a/include/agent/linux/get_machine_type.h
+++ b/include/agent/linux/get_machine_type.h
@@ -3,11 +3,10 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <iostream>
-#include <string>
 
 std::string get_machine_type();
diff --git a/include/agent/linux/get_user_count.h b/include/agent/linux/get_user_count.h
index 4b386c13..f80d58e3 100644
--- a/include/agent/linux/get_user_count.h
+++ b/include/agent/linux/get_user_count.h
@@ -9,7 +9,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
diff --git a/include/agent/linux/inventory.h b/include/agent/linux/inventory.h
index 069f12c1..3d96c0cf 100644
--- a/include/agent/linux/inventory.h
+++ b/include/agent/linux/inventory.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <string.h>
 #include <sys/utsname.h>
 #include <time.h>
 #include <iostream>
diff --git a/src/linux/get_date.cpp b/src/linux/get_date.cpp
index bf44044d..ac47db77 100644
--- a/src/linux/get_date.cpp
+++ b/src/linux/get_date.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <agent/linux/get_date.h>
-#include <string>
 
 std::string get_date() {
     std::string res = "";
diff --git a/src/linux/get_distro.cpp b/src/linux/get_distro.cpp
index d837d8fa..88a4fc8e 100644
--- a/src/linux/get_distro.cpp
+++ b/src/linux/get_distro.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "agent/linux/get_distro.h"
-#include <string>
 
 int open_file(std::string name, std::ifstream& fstream) {
         fstream.open(name);
diff --git a/src/linux/get_macaddr.cpp b/src/linux/get_macaddr.cpp
index d6335baf..63c25893 100644
--- a/src/linux/get_macaddr.cpp
+++ b/src/linux/get_macaddr.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <agent/linux/get_macaddr.h>
-#include <string>
 
 std::string get_macaddr() {
     std::fstream file;
diff --git a/src/linux/get_machine_type.cpp b/src/linux/get_machine_type.cpp
index 374c0548..7141a3a6 100644
--- a/src/linux/get_machine_type.cpp
+++ b/src/linux/get_machine_type.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <agent/linux/get_machine_type.h>
-#include <string>
 
 std::string get_machine_type() {
     struct addrinfo hints, *info, *p;
diff --git a/src/linux/get_time.cpp b/src/linux/get_time.cpp
index f70b0cf3..24caafe9 100644
--- a/src/linux/get_time.cpp
+++ b/src/linux/get_time.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "agent/linux/get_time.h"
-#include <string>
 
 // get current time
 std::string get_time() {
diff --git a/src/linux/get_user_count.cpp b/src/linux/get_user_count.cpp
index 80c0552a..b3e95ccf 100644
--- a/src/linux/get_user_count.cpp
+++ b/src/linux/get_user_count.cpp
@@ -31,7 +31,6 @@
  */
 
 #include "agent/linux/get_user_count.h"
-#include <string>
  #include <set>
 
 /* Global variables */
diff --git a/src/linux/inventory.cpp b/src/linux/inventory.cpp
index db201162..648f96cc 100644
--- a/src/linux/inventory.cpp
+++ b/src/linux/inventory.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "agent/linux/inventory.h"
-#include <string>
 
 std::string get_processor_model() {
     return "unknown";
-- 
GitLab