Merge remote branch 'origin/CMSSW_7_0_X' into CMSSW_7_0_X

cms-sw · Jan 14, 2014 · 73e96a0 · 73e96a0
2 parents 3fd3b9f + a88945e
commit 73e96a0
Showing 1 changed file with 54 additions and 12 deletions.
diff --git a/DQMServices/Core/interface/DQMStore.h b/DQMServices/Core/interface/DQMStore.h
@@ -87,34 +87,76 @@ class DQMStore
    public:
     friend class DQMStore;
 
+    // for the supported syntaxes, see the declarations of DQMStore::bookString
     template <typename... Args>
-    MonitorElement * bookString(Args... args) {
-      return owner_->bookString(args...);
+    MonitorElement * bookString(Args && ... args) {
+      return owner_->bookString(std::forward<Args>(args)...);
     }
 
+    // for the supported syntaxes, see the declarations of DQMStore::bookInt
     template <typename... Args>
-    MonitorElement * bookInt(Args... args) {
-      return owner_->bookInt(args...);
+    MonitorElement * bookInt(Args && ... args) {
+      return owner_->bookInt(std::forward<Args>(args)...);
     }
 
+    // for the supported syntaxes, see the declarations of DQMStore::bookFloat
     template <typename... Args>
-    MonitorElement * bookFloat(Args... args) {
-      return owner_->bookFloat(args...);
+    MonitorElement * bookFloat(Args && ... args) {
+      return owner_->bookFloat(std::forward<Args>(args)...);
     }
 
+    // for the supported syntaxes, see the declarations of DQMStore::book1D
     template <typename... Args>
-    MonitorElement * book1D(Args... args) {
-      return owner_->book1D(args...);
+    MonitorElement * book1D(Args && ... args) {
+      return owner_->book1D(std::forward<Args>(args)...);
     }
 
+    // for the supported syntaxes, see the declarations of DQMStore::book1S
     template <typename... Args>
-    MonitorElement * book2D(Args... args) {
-      return owner_->book2D(args...);
+    MonitorElement * book1S(Args && ... args) {
+      return owner_->book1S(std::forward<Args>(args)...);
     }
 
+    // for the supported syntaxes, see the declarations of DQMStore::book1DD
     template <typename... Args>
-    MonitorElement * bookProfile(Args... args) {
-      return owner_->bookProfile(args...);
+    MonitorElement * book1DD(Args && ... args) {
+      return owner_->book1DD(std::forward<Args>(args)...);
+    }
+
+    // for the supported syntaxes, see the declarations of DQMStore::book2D
+    template <typename... Args>
+    MonitorElement * book2D(Args && ... args) {
+      return owner_->book2D(std::forward<Args>(args)...);
+    }
+
+    // for the supported syntaxes, see the declarations of DQMStore::book2S
+    template <typename... Args>
+    MonitorElement * book2S(Args && ... args) {
+      return owner_->book2S(std::forward<Args>(args)...);
+    }
+
+    // for the supported syntaxes, see the declarations of DQMStore::book2DD
+    template <typename... Args>
+    MonitorElement * book2DD(Args && ... args) {
+      return owner_->book2DD(std::forward<Args>(args)...);
+    }
+
+    // for the supported syntaxes, see the declarations of DQMStore::book3D
+    template <typename... Args>
+    MonitorElement * book3D(Args && ... args) {
+      return owner_->book3D(std::forward<Args>(args)...);
+    }
+
+    // for the supported syntaxes, see the declarations of DQMStore::bookProfile
+    template <typename... Args>
+    MonitorElement * bookProfile(Args && ... args) {
+      return owner_->bookProfile(std::forward<Args>(args)...);
+    }
+
+    // for the supported syntaxes, see the declarations of DQMStore::bookProfile2D
+    template <typename... Args>
+    MonitorElement * bookProfile2D(Args && ... args) {
+      return owner_->bookProfile2D(std::forward<Args>(args)...);
     }
 
     void cd(void);