commit 195088519b79a9164f29d43a9d6c3d5405001de4
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jan 29 01:01:51 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jan 29 10:28:39 2014 -0800
tree dd5936b821633335bd8580d77332afcf7e995ba5
parent 09c613f7826ad1089258e562d21b6a7780369c3e

build+src: Updating common.hpp to import (std|boost)::(shared_ptr|function|...) into ndn namespace

Also fixing a small bug in wscript.

Change-Id: I8f20caa177cc015b7433d1ecd3db385f533437c6

src/security/sec-public-info-sqlite3.cpp

diff --git a/src/security/sec-public-info-sqlite3.cpp b/src/security/sec-public-info-sqlite3.cpp
index 4098b4a..b7f1f7e 100644
--- a/src/security/sec-public-info-sqlite3.cpp
+++ b/src/security/sec-public-info-sqlite3.cpp
@@ -6,10 +6,6 @@
  * See COPYING for copyright and distribution information.
  */
 
-// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
-#include "ndn-cpp-config.h"
-#ifdef NDN_CPP_HAVE_SQLITE3
-
 #include <sqlite3.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -722,4 +718,3 @@
 
 } // namespace ndn
 
-#endif // NDN_CPP_HAVE_SQLITE3

src/security/sec-public-info-sqlite3.hpp

diff --git a/src/security/sec-public-info-sqlite3.hpp b/src/security/sec-public-info-sqlite3.hpp
index 30f28f8..f6e45c3 100644
--- a/src/security/sec-public-info-sqlite3.hpp
+++ b/src/security/sec-public-info-sqlite3.hpp
@@ -9,10 +9,6 @@
 #ifndef NDN_SEC_PUBLIC_INFO_SQLITE3_HPP
 #define NDN_SEC_PUBLIC_INFO_SQLITE3_HPP
 
-// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
-#include "ndn-cpp-config.h"
-#ifdef NDN_CPP_HAVE_SQLITE3
-
 #include "../common.hpp"
 #include "sec-public-info.hpp"
 
@@ -219,6 +215,4 @@
 
 }
 
-#endif // NDN_CPP_HAVE_SQLITE3
-
 #endif

src/security/sec-tpm-osx.cpp

diff --git a/src/security/sec-tpm-osx.cpp b/src/security/sec-tpm-osx.cpp
index 8d5ab48..fed73e1 100644
--- a/src/security/sec-tpm-osx.cpp
+++ b/src/security/sec-tpm-osx.cpp
@@ -5,16 +5,14 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include "ndn-cpp-config.h"
+#include "sec-tpm-osx.hpp"
+
+#include "security/public-key.hpp"
+#include "util/logging.hpp"
 
 #include <fstream>
 #include <sstream>
 
-#include "../util/logging.hpp"
-
-#include "security/sec-tpm-osx.hpp"
-#include "security/public-key.hpp"
-
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/Security.h>
 #include <CoreServices/CoreServices.h>

src/security/sec-tpm-osx.hpp

diff --git a/src/security/sec-tpm-osx.hpp b/src/security/sec-tpm-osx.hpp
index 9834822..c724ca7 100644
--- a/src/security/sec-tpm-osx.hpp
+++ b/src/security/sec-tpm-osx.hpp
@@ -8,10 +8,6 @@
 #ifndef NDN_SEC_TPM_OSX_HPP
 #define NDN_SEC_TPM_OSX_HPP
 
-// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_OSX_SECURITY 1.
-#include "ndn-cpp-config.h"
-#if NDN_CPP_HAVE_OSX_SECURITY
-
 #include "../common.hpp"
 #include "sec-tpm.hpp"
 
@@ -117,8 +113,6 @@
   std::auto_ptr<Impl> impl_;
 };
   
-}
+} // namespace ndn
 
-#endif // NDN_CPP_HAVE_OSX_SECURITY
-
-#endif
+#endif // NDN_SEC_TPM_OSX_HPP