added c++0x

cms-cvs-history · May 14, 2011 · 9f85e72 · 9f85e72
1 parent d005be6
commit 9f85e72
Showing 1 changed file with 34 additions and 1 deletion.
diff --git a/interface/DetGroup.h b/interface/DetGroup.h
@@ -5,7 +5,7 @@
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 #include <vector>
 #include <utility>
-
+#include <algorithm>
 
 class DetGroupElement {
  public:
@@ -19,6 +19,21 @@ class DetGroupElement {
   DetGroupElement( const Det* d, const TrajectoryStateOnSurface& s) :
     det_(d), state_(s) {}
 
+#if defined( __GXX_EXPERIMENTAL_CXX0X__)
+  DetGroupElement(DetGroupElement const & rhs) : det_(rhs.det_), state_(rhs.state_){}
+  DetGroupElement(DetGroupElement && rhs) : det_(rhs.det_), state_(std::move(rhs.state_)){}
+  DetGroupElement & operator=(DetGroupElement const & rhs) {
+     det_=rhs.det_;
+     state_ = rhs.state_;
+     return *this;
+  }
+  DetGroupElement & operator=(DetGroupElement && rhs) {
+     det_=rhs.det_;
+     state_ = std::move(rhs.state_);
+     return *this;
+  }
+#endif
+
   const Det* det() const {return det_;}
   const TrajectoryStateOnSurface& trajectoryState() const {return state_;}
 
@@ -37,6 +52,24 @@ class DetGroup : public std::vector< DetGroupElement> {
   typedef DetGroupElement::DetWithState         DetWithState;
 
   DetGroup() {}
+#if defined( __GXX_EXPERIMENTAL_CXX0X__)
+  DetGroup(DetGroup const & rhs) : Base(rhs), index_(rhs.index_), indexSize_(rhs.indexSize_)  {}
+  DetGroup(DetGroup && rhs) : Base(std::forward<Base>(rhs)), index_(rhs.index_), indexSize_(rhs.indexSize_)  {}
+  DetGroup & operator=(DetGroup const & rhs) {
+    Base::operator=(rhs);
+    index_ =  rhs.index_;
+    indexSize_ = rhs.indexSize_;
+    return *this;
+  }
+  DetGroup & operator=(DetGroup && rhs) { 
+    Base::operator=(std::forward<Base>(rhs)); 
+    index_ =  rhs.index_;
+    indexSize_ = rhs.indexSize_;
+    return *this;
+  }
+#endif
+
+
   DetGroup(int ind, int indSize) : index_(ind), indexSize_(indSize) {}
 
   DetGroup(const std::vector<DetWithState>& vec) {