Changeset 2834 for trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Plotter2.cpp

    r2830 r2834  
    182182    info->xData.clear();
    183183    info->xData.reserve(inXData.size());
    184     for (uint i = 0; i < inXData.size(); ++i) {
     184    for (unsigned int i = 0; i < inXData.size(); ++i) {
    185185        info->xData.push_back(inXData[i]);
    186186
     
    192192    info->yData.clear();
    193193    info->yData.reserve(inYData.size());
    194     for (uint i = 0; i < inYData.size(); ++i) {
     194    for (unsigned int i = 0; i < inYData.size(); ++i) {
    195195        info->yData.push_back(inYData[i]);
    196196
     
    231231    maxYData = minYData;
    232232
    233     for (uint i = 0; i < vData.size(); ++i) {
    234         for (uint j = 0; j < vData[i].xData.size(); ++j) {
     233    for (unsigned int i = 0; i < vData.size(); ++i) {
     234        for (unsigned int j = 0; j < vData[i].xData.size(); ++j) {
    235235            updateXDataRange(vData[i].xData[j]);
    236236            updateYDataRange(vData[i].yData[j]);
     
    352352void Plotter2::getViewInfo() {
    353353    std::cout << "===================" << std::endl << std::flush;
    354     for (uint i = 0; i < vInfo.size(); ++i) {
     354    for (unsigned int i = 0; i < vInfo.size(); ++i) {
    355355        std::cout << "[" << i << "]  " << std::endl;
    356356        std::cout << "vpPos:  ";
     
    367367
    368368        std::cout << "vdatasize=" << vInfo[i].vData.size() << std::endl;
    369         for (uint j = 0; j < vInfo[i].vData.size(); ++j) {
     369        for (unsigned int j = 0; j < vInfo[i].vData.size(); ++j) {
    370370            std::cout << "vdataxdatasize=" << vInfo[i].vData[j].xData.size() << ", ";
    371             for (uint k = 0; k < vInfo[i].vData[j].xData.size(); ++k) {
     371            for (unsigned int k = 0; k < vInfo[i].vData[j].xData.size(); ++k) {
    372372                std::cout << "(" << vInfo[i].vData[j].xData[k] << ", ";
    373373                std::cout << vInfo[i].vData[j].yData[k] << ") ";
     
    995995    cpgscr(1, 0.0, 0.0, 0.0); // set foreground color black
    996996
    997     for (uint i = 0; i < vInfo.size(); ++i) {
     997    for (unsigned int i = 0; i < vInfo.size(); ++i) {
    998998        Plotter2ViewportInfo vi = vInfo[i];
    999999
     
    10221022
    10231023            // data
    1024             for (uint j = 0; j < vi.vData.size(); ++j) {
     1024            for (unsigned int j = 0; j < vi.vData.size(); ++j) {
    10251025                cpgstbg(0); // reset background colour to the initial one (white)
    10261026                cpgsci(1);  // reset foreground colour to the initial one (black)
     
    10621062
    10631063            // masks
    1064             for (uint j = 0; j < vi.vRect.size(); ++j) {
     1064            for (unsigned int j = 0; j < vi.vRect.size(); ++j) {
    10651065                cpgstbg(0); // reset background colour to the initial one (white)
    10661066                cpgsci(1);  // reset foreground colour to the initial one (black)
Note: See TracChangeset for help on using the changeset viewer.