commit 8e60bcdd8a3645243983d6a8603a927821b5da5e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 15 20:55:40 2015 +0000
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 16 12:28:22 2015 -0800
tree 27d50cc5c2825337bc8ae71a377fa1fc227a8eab
parent ab933c620a929135eb261fd36201cb0f1dd7c401

build: Fix compilation on Ubuntu platform and add work-around for ndn-cxx regression

Note that on Ubuntu 12.04, either boost libraries or compiler needs to be upgraded.

Change-Id: I33f1089f961f99abf3d1803bf833e76ff7fb528d
Refs: #2379, #2380, #2382, #2381, #2383

utils/trie/trie.hpp

diff --git a/utils/trie/trie.hpp b/utils/trie/trie.hpp
index 28c075e..6d11ecb 100644
--- a/utils/trie/trie.hpp
+++ b/utils/trie/trie.hpp
@@ -152,7 +152,7 @@
                                              // container
     , children_(bucket_traits(buckets_.get(), bucketSize_))
     , payload_(PayloadTraits::empty_payload)
-    , parent_(0)
+    , parent_(nullptr)
   {
   }