[Rcpp-commits] r3808 - pkg/RcppBDT/src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2012-10-23 02:09:00 +0200 (Tue, 23 Oct 2012)
New Revision: 3808

Modified:
   pkg/RcppBDT/src/RcppBDTdu.cpp
Log:
RcppBDTdu member variable back to provide, added three friend function declarations


Modified: pkg/RcppBDT/src/RcppBDTdu.cpp
===================================================================
--- pkg/RcppBDT/src/RcppBDTdu.cpp	2012-10-22 19:02:07 UTC (rev 3807)
+++ pkg/RcppBDT/src/RcppBDTdu.cpp	2012-10-23 00:09:00 UTC (rev 3808)
@@ -26,8 +26,8 @@
 public:
 
     bdtDu(int hours, int minutes, int seconds, int fractionalseconds) : m_td(hours, minutes, seconds, fractionalseconds) { }
-    bdtDu(boost::posix_time::time_duration td) : m_td(td){} 
-    bdtDu(const bdtDu& other) : m_td(other.m_td){}
+    bdtDu(boost::posix_time::time_duration td) : m_td(td) {} 
+    bdtDu(const bdtDu& other) : m_td(other.m_td ){}
     
     long getHours()             { return(m_td.hours()); }
     long getMinutes()           { return(m_td.minutes()); }
@@ -51,11 +51,13 @@
         pt += m_td;
         return Rcpp::wrap(pt); 
     }
-            
-// [RF] easier for me to have this public
-// private:
+
+private:
     boost::posix_time::time_duration m_td;
-            
+
+    friend Rcpp::object<bdtDu> arith_bdtDu_bdtDu(Rcpp::object<bdtDu>, Rcpp::object<bdtDu>, std::string);
+    friend Rcpp::object<bdtDu> arith_bdtDu_int(Rcpp::object<bdtDu>, int, std::string);
+    friend bool compare_bdtDu_bdtDu(Rcpp::object<bdtDu>, Rcpp::object<bdtDu>, std::string);
 };
 
 //using namespace Rcpp ;