Fixed errors and warnings from gcc4.1.2.

argiro · Mar 11, 2008 · f050721 · f050721
1 parent 0d0f664
commit f050721
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/CondFormats/L1TObjects/interface/L1TriggerKey.h b/CondFormats/L1TObjects/interface/L1TriggerKey.h
@@ -20,22 +20,9 @@
  */
 class L1TriggerKey
 {
-protected:
-    /* Mapping from records and types to tokens.
-     * I as unvable to make type std::map<std::pair<std::string, std::string>, std::string> persistent
-     * so record and type are concatanated with @ sign and resulting string is used as a key.
-     */
-
-  // wsun 03/2008: instead of tokens, store the configuration keys instead.
-/*     typedef std::map<std::string, std::string> RecordsToToken; */
-/*     RecordsToToken recordsToToken; */
+public:
     typedef std::map<std::string, std::string> RecordToKey;
-    RecordToKey m_recordToKey;
-
 
-    // wsun 03/2008: add data member for TSC key
-    std::string m_tscKey ;
-public:
     // Constructors
     L1TriggerKey () {}
 
@@ -63,6 +50,21 @@ class L1TriggerKey
 
     const RecordToKey& recordToKeyMap() const
       { return m_recordToKey ; }
+
+protected:
+    /* Mapping from records and types to tokens.
+     * I as unvable to make type std::map<std::pair<std::string, std::string>, std::string> persistent
+     * so record and type are concatanated with @ sign and resulting string is used as a key.
+     */
+
+  // wsun 03/2008: instead of tokens, store the configuration keys instead.
+/*     typedef std::map<std::string, std::string> RecordsToToken; */
+/*     RecordsToToken recordsToToken; */
+    RecordToKey m_recordToKey;
+
+
+    // wsun 03/2008: add data member for TSC key
+    std::string m_tscKey ;
 };
 
 #endif

diff --git a/CondTools/L1Trigger/interface/WriterProxy.h b/CondTools/L1Trigger/interface/WriterProxy.h
@@ -24,6 +24,8 @@ namespace l1t
 class WriterProxy
 {
     public:
+        virtual ~WriterProxy() {}
+
         /* Saves record and type from given event setup to pool DB. This method should not worry
          * about such things as IOV and so on. It should return new payload token and then
          * the framework would take care of it.
@@ -44,6 +46,8 @@ template<class Record, class Type>
 class WriterProxyT : public WriterProxy
 {
     public:
+        virtual ~WriterProxyT() {}
+
         /* This method requires that Record and Type supports copy constructor */
         virtual std::string save (const edm::EventSetup & setup, cond::PoolTransaction & pool) const
         {