changed Timer.h to re-enable build under current g++

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,8 @@
+2014-01-25  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/Rcpp/Benchmark/Timer.h: Simplified -- Rcpp Gallery
+	example using it was not building any longer under g++
+
 2014-01-23  Dirk Eddelbuettel  <edd@debian.org>
 
 	* inst/announce/ANNOUNCE-0.11.0.txt: Added for next release

DESCRIPTION

@@ -1,15 +1,13 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.10.6.8
-Date: 2014-01-19
-Authors@R: c(
-    person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org" ),
-    person("Romain", "Francois", role = "aut", email = "romain@r-enthusiasts.com"),
-    person("JJ", "Allaire", role = "ctb", email = "jj.allaire@gmail.com"),
-    person("John", "Chambers", role = "ctb", email = "jmc@r-project.org"),
-    person("Douglas", "Bates", role = "ctb", email = "bates@stat.wisc.edu"),
-    person("Kevin", "Ushey", role = "ctb", email = "kevinushey@gmail.com")
-    )
+Version: 0.10.6.9
+Date: 2014-01-25
+Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org" ),
+             person("Romain", "Francois", role = "aut", email = "romain@r-enthusiasts.com"),
+             person("JJ", "Allaire", role = "ctb", email = "jj.allaire@gmail.com"),
+             person("John", "Chambers", role = "ctb", email = "jmc@r-project.org"),
+             person("Douglas", "Bates", role = "ctb", email = "bates@stat.wisc.edu"),
+             person("Kevin", "Ushey", role = "ctb", email = "kevinushey@gmail.com"))
 Description: The Rcpp package provides R functions as well as a C++ library
  which facilitate the integration of R and C++.
  .

inst/include/Rcpp/Benchmark/Timer.h

@@ -1,8 +1,8 @@
-// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*-
 //
 // Timer.h: Rcpp R/C++ interface class library -- Rcpp benchmark utility
 //
-// Copyright (C) 2012 - 2013 JJ Allaire, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2014  JJ Allaire, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -106,34 +106,30 @@ namespace Rcpp{
         Timer() : data(), start_time( get_nanotime() ){}
 
         void step( const std::string& name){
-            nanotime_t now = get_nanotime() ;
-            data.push_back( std::make_pair( name, now - start_time ) ) ;
-            start_time = get_nanotime() ; 
+            nanotime_t now = get_nanotime();
+            data.push_back(std::make_pair(name, now - start_time));
+            start_time = get_nanotime(); 
         }
 
         operator SEXP() const {
-            NumericVector out( data.begin(), data.end(), get_second ) ; 
-            CharacterVector names( data.begin(), data.end(), get_first ) ;
-            out.attr( "names" ) = names ;
-            return out ;
+            size_t n = data.size();
+            NumericVector out(n);
+            CharacterVector names(n);
+            for (size_t i=0; i<n; i++) {
+                names[i] = data[i].first;
+                out[i] = data[i].second;
+            }
+            out.attr("names") = names;
+            return out;
         }
 
     private:
-        
-        inline std::string get_first( const std::pair<std::string,nanotime_t>& pair ){
-            return pair.first ;    
-        }
-        inline double get_second( const std::pair<std::string,nanotime_t>& pair ){
-            return static_cast<double>(pair.second) ;    
-        }
-        
         typedef std::pair<std::string,nanotime_t> Step;
         typedef std::vector<Step> Steps;
 
-        Steps data ;
-        nanotime_t start_time ;
-            
-    } ;
+        Steps data;
+        nanotime_t start_time;
+    };
 
 }