| commit | 17032f8fa6aebc6d5f399e171ed77f2b4e01b001 | [log] [tgz] |
|---|---|---|
| author | Yingdi Yu <yuyingdi@gmail.com> | Tue Mar 25 15:48:23 2014 -0700 |
| committer | Alexander Afanasyev <alexander.afanasyev@ucla.edu> | Fri May 09 15:16:11 2014 -0700 |
| tree | ce64143958c400f393114a05985d06b8456da534 | |
| parent | a7876727b0b405fec8dcbe82443c233c7493fa08 [diff] [blame] |
namespace: try to resolve ndn and std conflicts Change-Id: I141ead4b8f30ce75bae73974e47e6e5acd75a296
diff --git a/src/controller.cpp b/src/controller.cpp index 4d80604..171dfc7 100644 --- a/src/controller.cpp +++ b/src/controller.cpp
@@ -39,6 +39,8 @@ namespace chronos { +using ndn::shared_ptr; + static const uint8_t ROUTING_PREFIX_SEPARATOR[2] = {0xF0, 0x2E}; // constructor & destructor