| commit | babedfe91d244e931aa51baa47fefbce8d7ae57b | [log] [tgz] |
|---|---|---|
| author | Ed Tanous <ed.tanous@intel.com> | Fri Jan 12 10:50:26 2018 -0800 |
| committer | Ed Tanous <ed.tanous@intel.com> | Fri Jan 12 14:40:08 2018 -0800 |
| tree | da7918898cd980ad1a478b3266535b10c9c05885 | |
| parent | e617c9ab09c70c45ad098c68e709787d0783f908 [diff] |
Fix merge error introduced with base64.hpp deletion Change-Id: If1e194009cec31c593e4a0f89c875a3e3bd84110
diff --git a/include/pam_authenticate.hpp b/include/pam_authenticate.hpp index d0ca1b0..5b4b454 100644 --- a/include/pam_authenticate.hpp +++ b/include/pam_authenticate.hpp
@@ -1,6 +1,7 @@ #pragma once #include <security/pam_appl.h> +#include <memory> #include <cstring> // function used to get user input
diff --git a/include/persistent_data_middleware.hpp b/include/persistent_data_middleware.hpp index a8d3b3f..dc4ec8c 100644 --- a/include/persistent_data_middleware.hpp +++ b/include/persistent_data_middleware.hpp
@@ -1,10 +1,10 @@ #pragma once -#include <base64.hpp> #include <nlohmann/json.hpp> #include <pam_authenticate.hpp> #include <webassets.hpp> -#include <random> + +include <random> #include <crow/app.h> #include <crow/http_request.h> #include <crow/http_response.h>
diff --git a/include/token_authorization_middleware.hpp b/include/token_authorization_middleware.hpp index 67f1161..81d9e58 100644 --- a/include/token_authorization_middleware.hpp +++ b/include/token_authorization_middleware.hpp
@@ -1,6 +1,5 @@ #pragma once -#include <base64.hpp> #include <pam_authenticate.hpp> #include <persistent_data_middleware.hpp> #include <webassets.hpp>