Changeset 2834 for trunk

Timestamp:

08/01/13 12:06:22 (11 years ago)

Author:

Kana Sugimoto

Message:

New Development: No (a bug fix)

JIRA Issue: Yes (CAS-3620)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): asap.plotter2

Description:

Fixed a bug which caused build failure on OSX.
Changed all declaration of data type 'uint' to 'unsigned int'.
'uint' is not a standard data type of c++, but is available in
some c++ compilers by default via typedef.
So there is not guarantee that a compiler understands 'uint' type.
It's better using standard type, unsigned int.

File:

• trunk/src/Plotter2.cpp (modified) (8 diffs)

trunk/src/Plotter2.cpp

@@ -182 +182 @@
     info->xData.clear();
     info->xData.reserve(inXData.size());
-    for (uint i = 0; i < inXData.size(); ++i) {
+    for (unsigned int i = 0; i < inXData.size(); ++i) {
         info->xData.push_back(inXData[i]);
 
@@ -192 +192 @@
     info->yData.clear();
     info->yData.reserve(inYData.size());
-    for (uint i = 0; i < inYData.size(); ++i) {
+    for (unsigned int i = 0; i < inYData.size(); ++i) {
         info->yData.push_back(inYData[i]);
 
@@ -231 +231 @@
     maxYData = minYData;
 
-    for (uint i = 0; i < vData.size(); ++i) {
-        for (uint j = 0; j < vData[i].xData.size(); ++j) {
+    for (unsigned int i = 0; i < vData.size(); ++i) {
+        for (unsigned int j = 0; j < vData[i].xData.size(); ++j) {
             updateXDataRange(vData[i].xData[j]);
             updateYDataRange(vData[i].yData[j]);
@@ -352 +352 @@
 void Plotter2::getViewInfo() {
     std::cout << "===================" << std::endl << std::flush;
-    for (uint i = 0; i < vInfo.size(); ++i) {
+    for (unsigned int i = 0; i < vInfo.size(); ++i) {
         std::cout << "[" << i << "]  " << std::endl;
         std::cout << "vpPos:  ";
@@ -367 +367 @@
 
         std::cout << "vdatasize=" << vInfo[i].vData.size() << std::endl;
-        for (uint j = 0; j < vInfo[i].vData.size(); ++j) {
+        for (unsigned int j = 0; j < vInfo[i].vData.size(); ++j) {
             std::cout << "vdataxdatasize=" << vInfo[i].vData[j].xData.size() << ", ";
-            for (uint k = 0; k < vInfo[i].vData[j].xData.size(); ++k) {
+            for (unsigned int k = 0; k < vInfo[i].vData[j].xData.size(); ++k) {
                 std::cout << "(" << vInfo[i].vData[j].xData[k] << ", ";
                 std::cout << vInfo[i].vData[j].yData[k] << ") ";
@@ -995 +995 @@
     cpgscr(1, 0.0, 0.0, 0.0); // set foreground color black
 
-    for (uint i = 0; i < vInfo.size(); ++i) {
+    for (unsigned int i = 0; i < vInfo.size(); ++i) {
         Plotter2ViewportInfo vi = vInfo[i];
 
@@ -1022 +1022 @@
 
             // data
-            for (uint j = 0; j < vi.vData.size(); ++j) {
+            for (unsigned int j = 0; j < vi.vData.size(); ++j) {
                 cpgstbg(0); // reset background colour to the initial one (white)
                 cpgsci(1);  // reset foreground colour to the initial one (black)
@@ -1062 +1062 @@
 
             // masks
-            for (uint j = 0; j < vi.vRect.size(); ++j) {
+            for (unsigned int j = 0; j < vi.vRect.size(); ++j) {
                 cpgstbg(0); // reset background colour to the initial one (white)
                 cpgsci(1);  // reset foreground colour to the initial one (black)