commit ce0016970f93e279a24374c2bf1ee2e14a52ef9a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Jul 14 11:34:41 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Jul 14 11:34:41 2013 -0700
tree d5b9a3b9208983acd919cd735d0b54f6c3901eeb
parent 6133f9ac4b6552f258602ebf0c007926f0fadc59

Finishing reorganization and making sure code compiles

src/sync-logic.cc

diff --git a/src/sync-logic.cc b/src/sync-logic.cc
index 25b51ce..98160b5 100644
--- a/src/sync-logic.cc
+++ b/src/sync-logic.cc
@@ -28,7 +28,7 @@
 #include "sync-logic.h"
 #include "sync-diff-leaf.h"
 #include "sync-full-leaf.h"
-#include "sync-log.h"
+#include "sync-logging.h"
 #include "sync-state.h"
 
 #include <boost/make_shared.hpp>
@@ -64,10 +64,9 @@
   , m_syncInterestTable (TIME_SECONDS (m_syncInterestReexpress))
   , m_syncPrefix (syncPrefix)
   , m_onUpdate (onUpdate)
-  , m_perBranch (false)
   , m_onRemove (onRemove)
+  , m_perBranch (false)
   , m_ccnxHandle(new CcnxWrapper ())
-  , m_recoveryRetransmissionInterval (m_defaultRecoveryRetransmitInterval)
 #ifndef NS3_MODULE
   , m_randomGenerator (static_cast<unsigned int> (std::time (0)))
   , m_rangeUniformRandom (m_randomGenerator, uniform_int<> (200,1000))
@@ -76,6 +75,7 @@
   , m_rangeUniformRandom (200,1000)
   , m_reexpressionJitter (10,500)
 #endif
+  , m_recoveryRetransmissionInterval (m_defaultRecoveryRetransmitInterval)
 { 
 #ifndef NS3_MODULE
   // In NS3 module these functions are moved to StartApplication method
@@ -97,7 +97,6 @@
   , m_onUpdateBranch (onUpdateBranch)
   , m_perBranch(true)
   , m_ccnxHandle(new CcnxWrapper())
-  , m_recoveryRetransmissionInterval (m_defaultRecoveryRetransmitInterval)
 #ifndef NS3_MODULE
   , m_randomGenerator (static_cast<unsigned int> (std::time (0)))
   , m_rangeUniformRandom (m_randomGenerator, uniform_int<> (200,1000))
@@ -106,6 +105,7 @@
   , m_rangeUniformRandom (200,1000)
   , m_reexpressionJitter (10,500)
 #endif
+  , m_recoveryRetransmissionInterval (m_defaultRecoveryRetransmitInterval)
 { 
 #ifndef NS3_MODULE
   // In NS3 module these functions are moved to StartApplication method