commit 4a97931db947103c725007e0b12bc9643abb30df
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Nov 07 15:30:05 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:16:08 2014 -0700
tree c611dd1edaef850d07a711c5d822455fd18b706d
parent 382bcb9765dc5f4442a3e8b51a7af1bc9e6b386a

Returning ChronoSync submodule, making it compile on OSX 10.9

src/addcontactpanel.cpp

diff --git a/src/addcontactpanel.cpp b/src/addcontactpanel.cpp
index 8e90f66..78f6102 100644
--- a/src/addcontactpanel.cpp
+++ b/src/addcontactpanel.cpp
@@ -173,7 +173,7 @@
     return;
   }
 
-  m_currentCollectEndorseReady = NULL;
+  m_currentCollectEndorseReady = false;
 
   displayContactInfo();
 }

src/chatdialog.h

diff --git a/src/chatdialog.h b/src/chatdialog.h
index b59a5a4..d7a1520 100644
--- a/src/chatdialog.h
+++ b/src/chatdialog.h
@@ -28,7 +28,7 @@
 #include "invitation-policy-manager.h"
 #include "contact-item.h"
 
-#include <ccnx/sync-socket.h>
+#include <sync-socket.h>
 #include <sync-seq-no.h>
 #include "chatbuf.pb.h"
 #include "digesttreescene.h"

src/digesttreescene.h

diff --git a/src/digesttreescene.h b/src/digesttreescene.h
index 7266ecb..e7600e8 100644
--- a/src/digesttreescene.h
+++ b/src/digesttreescene.h
@@ -23,7 +23,7 @@
 #include <sync-logic.h>
 #include <ctime>
 #include <vector>
-#include <tr1/memory>
+#include <boost/shared_ptr.hpp>
 #endif
 
 const int FRESHNESS = 60;
@@ -32,7 +32,7 @@
 
 class User;
 class DisplayUser;
-typedef std::tr1::shared_ptr<DisplayUser> DisplayUserPtr;
+typedef boost::shared_ptr<DisplayUser> DisplayUserPtr;
 static DisplayUserPtr DisplayUserNullPtr;
 
 class DigestTreeScene : public QGraphicsScene