Changeset 12967 for trunk

Timestamp:

02/29/12 10:30:19 (13 years ago)

Author:

tbretz

Message:

Fixed some trivial compiler warnings.

Location:

trunk

Files:

• FACT++/gui/RawEventsViewer/RawEventsViewer.cc (modified) (3 diffs)
• FACT++/src/fitsdump.cc (modified) (9 diffs)
• Mars/mcore/DrsCalib.h (modified) (2 diffs)

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -71 +71 @@
 {
     GLfloat color[3];
-    int first, second;
+    int first;
     first = vertex-1;
     if (first < 0)
@@ -683 +683 @@
 
 template <typename T>
-void RawDataViewer::getCalibrationDataForDisplay(const CalibDataTypes calibTypes,
+void RawDataViewer::getCalibrationDataForDisplay(const CalibDataTypes/* calibTypes*/,
                                                  const vector<T>& inputData,
                                                  const int roi,
@@ -750 +750 @@
     //hide the time markers
     int nSlicesToRemove = 60;
-    float* backupData;
+    float* backupData = 0;
     if (nRoiTM == 0) //they are written into the regular channel
     {

trunk/FACT++/src/fitsdump.cc

@@ -355 +355 @@
 #endif
 
-        ostringstream out;
-        out.precision(fout.precision());
+        ostringstream sout;
+        sout.precision(fout.precision());
         for (auto it=cols.begin(); it!=cols.end(); it++)
         {
@@ -368 +368 @@
                     break;
                 case 'B':
-                    out << (unsigned int)reinterpret_cast<const unsigned char*>(it->ptr)[i] << " ";
+                    sout << (unsigned int)reinterpret_cast<const unsigned char*>(it->ptr)[i] << " ";
                     break;
                 case 'L':
-                    out << reinterpret_cast<const bool*>(it->ptr)[i] << " ";
+                    sout << reinterpret_cast<const bool*>(it->ptr)[i] << " ";
                     break;
                 case 'I':
-                    out << reinterpret_cast<const int16_t*>(it->ptr)[i] << " ";
+                    sout << reinterpret_cast<const int16_t*>(it->ptr)[i] << " ";
                     break;
                 case 'J':
-                    out << reinterpret_cast<const int32_t*>(it->ptr)[i] << " ";
+                    sout << reinterpret_cast<const int32_t*>(it->ptr)[i] << " ";
                     break;
                 case 'K':
-                    out << reinterpret_cast<const int64_t*>(it->ptr)[i] << " ";
+                    sout << reinterpret_cast<const int64_t*>(it->ptr)[i] << " ";
                     break;
                 case 'E':
-                    out << reinterpret_cast<const float*>(it->ptr)[i] << " ";
+                    sout << reinterpret_cast<const float*>(it->ptr)[i] << " ";
                     break;
                 case 'D':
-                    out << reinterpret_cast<const double*>(it->ptr)[i] << " ";
+                    sout << reinterpret_cast<const double*>(it->ptr)[i] << " ";
                     break;
                 default:
@@ -399 +399 @@
 
             if (it->col.type=='A')
-                out << "'" << msg << "' ";
+                sout << "'" << msg << "' ";
         }
 #ifdef HAVE_ROOT
@@ -405 +405 @@
             continue;
 #endif
-        fout << out.str() << endl;
+        fout << sout.str() << endl;
     }
 }
@@ -424 +424 @@
         *it = ' '+*it;
 
-        string::const_iterator beg = it->begin();
-        string::const_iterator end = it->end();
+        string::const_iterator ibeg = it->begin();
+        string::const_iterator iend = it->end();
 
         boost::smatch what;
-        while (boost::regex_search(beg, end, what, expr, boost::match_extra))
+        while (boost::regex_search(ibeg, iend, what, expr, boost::match_extra))
         {
             const string all  = what[0];
@@ -438 +438 @@
             if (ic==cols.end())
             {
-                beg++;
+                ibeg++;
                 //cout << "Column '" << name << "' does not exist." << endl;
                 //return vector<MyColumn>();
@@ -458 +458 @@
             id << '[' << p << ']';
 
-            it->replace(beg-it->begin()+what.position(1), what.length()-1, id.str());
-
-            beg = what[0].first+3;
-            end = it->end();
+            it->replace(ibeg-it->begin()+what.position(1), what.length()-1, id.str());
+
+            ibeg = what[0].first+3;
+            iend = it->end();
 
             if (p<vec.size())
@@ -575 +575 @@
             break;
 
-        //data[p++] = first-1;
-
-        ostringstream out;
-        out.precision(fout.precision());
-
         size_t p = 0;
         for (auto it=vec.begin(); it!=vec.end(); it++, p++)
@@ -590 +585 @@
 
         for (auto iform=form.begin()+1; iform!=form.end(); iform++)
-            out << iform->EvalPar(0, data.data()) << " ";
-
-        fout << out.str() << endl;
+            fout << iform->EvalPar(0, data.data()) << " ";
+
+        fout << endl;
     }
 #endif

trunk/Mars/mcore/DrsCalib.h

@@ -573 +573 @@
             for (auto it=beg; it!=end-512; it++, n++)
             {
-                const double v = it->first;
-                const double w = it->second;
+                const double valv = it->first;
+                const double valw = it->second;
 
                 it->first = sumv>0 ? n*(1-s*sumw/sumv) :0;
 
-                sumw += w;
-                sumv += v;
+                sumv += valv;
+                sumw += valw;
             }
 
@@ -588 +588 @@
             for (auto it=end-1; it!=beg-1+512; it--, n++)
             {
-                const double v = it->first;
-                const double w = it->second;
-
-                sumw += w;
-                sumv += v;
+                const double valv = it->first;
+                const double valw = it->second;
+
+                sumv += valv;
+                sumw += valw;
 
                 it->first = sumv>0 ? n*(s*sumw/sumv-1) : 0;