commit 5afbb0b3dde7efe8b2fc9caf9898db3e0499e0bc
author Davide Pesavento <davide.pesavento@lip6.fr> Mon Jan 01 17:24:18 2018 -0500
committer Alexander Afanasyev <aa@cs.fiu.edu> Sat Jan 06 12:21:22 2018 -0500
tree d1ba9e0eb0b42354eb23ef2a3d047033680626fb
parent e84d1eb0ef948ee5414667fced2d1051563eee67

util: switch to boost::asio::basic_waitable_timer

Change-Id: I2724befc86482adf84f59063e65509a116bb1b46
Refs: #4431

src/security/tpm/back-end-file.cpp

diff --git a/src/security/tpm/back-end-file.cpp b/src/security/tpm/back-end-file.cpp
index 1adcf1c..7c836d2 100644
--- a/src/security/tpm/back-end-file.cpp
+++ b/src/security/tpm/back-end-file.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2017 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2018 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -24,9 +24,11 @@
 #include "../transform.hpp"
 #include "../transform/private-key.hpp"
 #include "../../encoding/buffer-stream.hpp"
-#include <unordered_map>
-#include <fstream>
+
 #include <cstdlib>
+#include <fstream>
+#include <sys/stat.h>
+
 #include <boost/filesystem.hpp>
 
 namespace ndn {
@@ -45,12 +47,12 @@
       keystorePath = boost::filesystem::path(dir);
     }
 #ifdef NDN_CXX_HAVE_TESTS
-    else if (getenv("TEST_HOME") != nullptr) {
-      keystorePath = boost::filesystem::path(getenv("TEST_HOME")) / ".ndn";
+    else if (std::getenv("TEST_HOME") != nullptr) {
+      keystorePath = boost::filesystem::path(std::getenv("TEST_HOME")) / ".ndn";
     }
 #endif // NDN_CXX_HAVE_TESTS
-    else if (getenv("HOME") != nullptr) {
-      keystorePath = boost::filesystem::path(getenv("HOME")) / ".ndn";
+    else if (std::getenv("HOME") != nullptr) {
+      keystorePath = boost::filesystem::path(std::getenv("HOME")) / ".ndn";
     }
     else {
       keystorePath = boost::filesystem::current_path() / ".ndn";
@@ -191,7 +193,7 @@
   key->savePkcs1Base64(os);
 
   // set file permission
-  chmod(fileName.c_str(), 0000400);
+  ::chmod(fileName.c_str(), 0000400);
 }
 
 } // namespace tpm