[Boost-commit] svn:boost r83223 - in sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1: . Syncable

Subject: [Boost-commit] svn:boost r83223 - in sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1: . Syncable
From: afojgo_at_[hidden]
Date: 2013-02-28 20:36:26

Author: jofaber
Date: 2013-02-28 20:36:25 EST (Thu, 28 Feb 2013)
New Revision: 83223
URL: http://svn.boost.org/trac/boost/changeset/83223

Log:
Adaptations for clang.
Text files modified: 
   sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Playable.h                    |     2 +-                                      
   sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Node.h               |     6 +++---                                  
   sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Syncable_ModeledBy.h |     2 +-                                      
   sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Vector.h             |    12 ++----------                            
   sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeMaker.h                   |     2 +-                                      
   sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeMerge.h                   |    12 ++++++------                            
   sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeSync1.cpp                 |     7 ++-----                                 
   7 files changed, 16 insertions(+), 27 deletions(-)

Modified: sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Playable.h
==============================================================================
--- sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Playable.h	(original)
+++ sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Playable.h	2013-02-28 20:36:25 EST (Thu, 28 Feb 2013)
@@ -1,5 +1,5 @@
 #pragma once
-#include "Syncable_ModeledBy.h"
+//#include "Syncable_ModeledBy.h"
 
 template<class Uuid = int, class Time = int>
 class Playable

Modified: sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Node.h
==============================================================================
--- sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Node.h	(original)
+++ sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Node.h	2013-02-28 20:36:25 EST (Thu, 28 Feb 2013)
@@ -12,8 +12,8 @@
   typedef ContentT        Content;
   typedef UuidT           Uuid;
   typedef TimeT           Time;
-  typedef Vector<Content> ContentVec;
-  typedef Vector<Node>    NodeVec;
+  typedef Vector<Content,Uuid,Time> ContentVec;
+  typedef Vector<Node,Uuid,Time>    NodeVec;
 
   typedef typename ContentVec::const_iterator element_const_iterator;
   typedef typename ContentVec::iterator element_iterator;
@@ -117,7 +117,7 @@
 struct Syncable_ModeledBy<Node<ContentT,UuidT,TimeT> >
 {
     static const bool value = true;
-    typedef typename Node<ContentT,UuidT,TimeT> Model;
+    typedef Node<ContentT,UuidT,TimeT> Model;
     typedef typename Model::Uuid Uuid;
     typedef typename Model::Time Time;
     static Uuid uuid(Model const& object){ return object.uuid(); }

Modified: sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Syncable_ModeledBy.h
==============================================================================
--- sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Syncable_ModeledBy.h	(original)
+++ sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Syncable_ModeledBy.h	2013-02-28 20:36:25 EST (Thu, 28 Feb 2013)
@@ -7,7 +7,7 @@
 template<class ModelT> struct Syncable_ModeledBy
 {
     static const bool value = false;
-    typedef typename ModelT Model;
+    typedef ModelT Model;
     typedef typename Model::Uuid Uuid;
     typedef typename Model::Time Time;
     static Uuid uuid(Model const&);

Modified: sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Vector.h
==============================================================================
--- sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Vector.h	(original)
+++ sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/Syncable/Vector.h	2013-02-28 20:36:25 EST (Thu, 28 Feb 2013)
@@ -8,9 +8,9 @@
 class Vector
 {
 public:
-  typedef std::vector<Type>                    tVector;
   typedef UuidT                                Uuid;
   typedef TimeT                                Time;
+  typedef std::vector<Type>                    tVector;
 
   typedef typename tVector::size_type          size_type;
   typedef typename tVector::value_type         value_type;
@@ -89,20 +89,12 @@
   tVector m_vector;  
 };
 
-/*CL
-template<class Type, class Uuid, class Time>
-bool operator < (Vector<Type,Uuid,Time> const& lhs, Vector<Type,Uuid,Time> const& rhs)
-{
-  return lhs.uuid() < rhs.uuid();
-}
-*/
-
 
 template<class ElementT, class UuidT, class TimeT> 
 struct Syncable_ModeledBy<Vector<ElementT,UuidT,TimeT> >
 {
     static const bool value = true;
-    typedef typename Vector<ElementT,UuidT,TimeT> Model;
+    typedef Vector<ElementT,UuidT,TimeT> Model;
     typedef typename Model::Uuid Uuid;
     typedef typename Model::Time Time;
     static Uuid uuid(Model const& object){ return object.uuid(); }

Modified: sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeMaker.h
==============================================================================
--- sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeMaker.h	(original)
+++ sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeMaker.h	2013-02-28 20:36:25 EST (Thu, 28 Feb 2013)
@@ -2,7 +2,7 @@
 
 #include "Syncable/Vector.h"
 #include "Syncable/Node.h"
-#include "Syncable/Playable.h"
+#include "Playable.h"
 
 typedef Vector<Playable<int> >   Playlist;
 typedef Vector<Playlist>         Playlists;

Modified: sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeMerge.h
==============================================================================
--- sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeMerge.h	(original)
+++ sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeMerge.h	2013-02-28 20:36:25 EST (Thu, 28 Feb 2013)
@@ -7,7 +7,7 @@
 #include "Syncable/Syncable_Concept.h"
 #include "Syncable/Vector.h"
 #include "Syncable/Node.h"
-#include "Syncable/Playable.h"
+#include "Playable.h"
 
 template<class Mergable>
 struct Merger
@@ -22,7 +22,7 @@
 Node<Type,UuidT,TimeT>
 merge(Node<Type,UuidT,TimeT>const& lhs, Node<Type,UuidT,TimeT>const& rhs)
 {
-  typedef typename Node<Type,UuidT,TimeT> NodeT;
+  typedef Node<Type,UuidT,TimeT> NodeT;
   typedef typename NodeT::ContentVec ContentVec;
   NodeT merged;
   merged.setUuid(lhs.uuid());
@@ -40,9 +40,9 @@
 typename Node<Type,UuidT,TimeT>::ContentVec
 mergeElements(Node<Type,UuidT,TimeT>const& lhs, Node<Type,UuidT,TimeT>const& rhs)
 {
-  typedef typename Node<Type,UuidT,TimeT> NodeT;
-  typedef NodeT::ContentVec               Elements;
-  typedef Elements::value_type            Element;
+  typedef Node<Type,UuidT,TimeT>          NodeT;
+  typedef typename NodeT::ContentVec      Elements;
+  typedef typename Elements::value_type   Element;
 
   Elements merged;
   merged.reserve(lhs.element_count() + rhs.element_count());
@@ -65,7 +65,7 @@
 typename Node<Type,UuidT,TimeT>::NodeVec
 mergeNodes(Node<Type,UuidT,TimeT>const& lhs, Node<Type,UuidT,TimeT>const& rhs)
 {
-  typedef Node<Type>::NodeVec Nodes;
+  typedef typename Node<Type>::NodeVec Nodes;
   typedef typename Nodes::value_type NodeType;
 
   Nodes merged;

Modified: sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeSync1.cpp
==============================================================================
--- sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeSync1.cpp	(original)
+++ sandbox/icl/libs/xplore/value_sem/TreeSync1/TreeSync1/TreeSync1.cpp	2013-02-28 20:36:25 EST (Thu, 28 Feb 2013)
@@ -1,7 +1,3 @@
-// TreeSync1.cpp : Defines the entry point for the console application.
-//
-
-#include "stdafx.h"
 #include <iostream>
 
 #include "TreeMerge.h"
@@ -28,7 +24,8 @@
 
 
 
-int _tmain(int argc, _TCHAR* argv[])
+//CL int _tmain(int argc, _TCHAR* argv[])
+int main()
 {
   std::cout << "Hello concept\n";