commit 766cea79319cadb3e2369f1469b82cee145f1d7d
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Apr 24 19:16:42 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Apr 24 22:49:51 2014 -0700
tree 0375ec741c5de44a9a8c88dcb384ff6c7478aa04
parent 5e96e00d242d9e0828fd982e73b99f0c350e34ee

====== Renaming library to ndn-cxx ======

Dependent applications should perform the following changes:

* all includes should be changed from <ndn-cpp-dev/...> to <ndn-cxx/...>
* documentation files/comments referring to ndn-cpp-dev should be
  updated and refer to ndn-cxx
* if the app uses pkgconfig for dependency detection, 'libndn-cpp-dev'
  should be replaced with 'libndn-cxx'.  Example for waf users:

    conf.check_cfg(package = 'libndn-cxx', args = ['--cflags', '--libs'],
                   uselib_store = 'NDN_CXX', mandatory = True)

Change-Id: I92d9ec7ff176b9fe8b4352bf04bbb32aa810422d
Refs: #1491

src/security/key-chain.hpp

diff --git a/src/security/key-chain.hpp b/src/security/key-chain.hpp
index 5143a4a..40ffd3c 100644
--- a/src/security/key-chain.hpp
+++ b/src/security/key-chain.hpp
@@ -25,7 +25,7 @@
 #include "sec-tpm-file.hpp"
 #include "sec-tpm-memory.hpp"
 
-#ifdef NDN_CPP_HAVE_OSX_SECURITY
+#ifdef NDN_CXX_HAVE_OSX_SECURITY
 #include "sec-tpm-osx.hpp"
 #endif
 
@@ -662,7 +662,7 @@
 
 
 
-#if defined(NDN_CPP_HAVE_OSX_SECURITY) and defined(NDN_CPP_WITH_OSX_KEYCHAIN)
+#if defined(NDN_CXX_HAVE_OSX_SECURITY) and defined(NDN_CXX_WITH_OSX_KEYCHAIN)
 
 namespace ndn {
 
@@ -678,6 +678,6 @@
 
 } // namespace ndn
 
-#endif //NDN_CPP_HAVE_OSX_SECURITY
+#endif // NDN_CXX_HAVE_OSX_SECURITY
 
-#endif //NDN_SECURITY_KEY_CHAIN_HPP
+#endif // NDN_SECURITY_KEY_CHAIN_HPP

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 4df238c..04938b4 100644
--- a/src/security/sec-public-info-sqlite3.cpp
+++ b/src/security/sec-public-info-sqlite3.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
 /**
- * Copyright (C) 2013 Regents of the University of California.
+ * Copyright (c) 2013-2014 Regents of the University of California.
  * @author: Yingdi Yu <yingdi@cs.ucla.edu>
  * @author: Jeff Thompson <jefft0@remap.ucla.edu>
  * See COPYING for copyright and distribution information.
@@ -92,7 +92,7 @@
   /// @todo Add define for windows/unix in wscript. The following may completely fail on windows
   int res = sqlite3_open_v2((identityDir / "ndnsec-public-info.db").c_str(), &m_database,
                             SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE,
-#ifdef NDN_CPP_DISABLE_SQLITE3_FS_LOCKING
+#ifdef NDN_CXX_DISABLE_SQLITE3_FS_LOCKING
                                                        "unix-dotfile"
 #else
                             0