← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnudatalanguage/saucy-proposed

« back to all changes in this revision

Viewing changes to src/ncdf_dim_cl.cpp

  • Committer: Package Import Robot
  • Author(s): Axel Beckert
  • Date: 2013-05-15 02:23:58 UTC
  • mfrom: (15.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20130515022358-rziznpf225zn9lv9
Tags: 0.9.3-2
* Upload to unstable.
* Revamp debian/rules
  - Allow parallel builds
  - Use debian/manpages instead of dh_installman parameter
  - Switch to dh7 style debian/rules file
* Bump debhelper compatibility to 9
  - Update versioned debhelper build-dependency
* Bump Standards-Version to 3.9.4 (no changes)
* Apply wrap-and-sort

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ncdf_dim_cl.cpp
63
63
    e->AssureLongScalarPar(0, cdfid);
64
64
 
65
65
    BaseGDL* p1 = e->GetParDefined( 1); 
66
 
    if (p1->Type() != STRING) {
 
66
    if (p1->Type() != GDL_STRING) {
67
67
      // Numeric
68
68
      e->AssureLongScalarPar(1, dimid);
69
69
    } else {
82
82
 
83
83
    //fill in the return variables
84
84
    //name
85
 
    delete e->GetParGlobal(2);
 
85
    GDLDelete(e->GetParGlobal(2));
86
86
    e->GetParGlobal(2)=new DStringGDL(dim_name);
87
87
 
88
88
    //size
89
 
    delete e->GetParGlobal(3);
 
89
    GDLDelete(e->GetParGlobal(3));
90
90
    e->GetParGlobal(3)=new DLongGDL(dim_size);
91
91
    return;
92
92
 
143
143
 
144
144
        BaseGDL* s=e->GetParDefined(2);
145
145
        size_t ds;
146
 
        if(s->Type() == LONG)
 
146
        if(s->Type() == GDL_LONG)
147
147
          {
148
148
            DLong lvar;
149
149
            e->AssureScalarPar<DLongGDL>(2, lvar);
150
150
            ds=static_cast<size_t>(lvar);
151
151
            
152
152
          }
153
 
        else if(s->Type() == INT)
 
153
        else if(s->Type() == GDL_INT)
154
154
          {
155
155
            DInt ivar;
156
156
            e->AssureScalarPar<DIntGDL>(2, ivar);
157
157
            ds=static_cast<size_t>(ivar);
158
158
          
159
 
}       else if(s->Type() == FLOAT)
 
159
}       else if(s->Type() == GDL_FLOAT)
160
160
          {
161
161
            DFloat fvar;
162
162
            e->AssureScalarPar<DFloatGDL>(2, fvar);
163
163
            ds=static_cast<size_t>(fvar);
164
164
          }
165
 
        else if(s->Type() == DOUBLE)
 
165
        else if(s->Type() == GDL_DOUBLE)
166
166
          {
167
167
            DDouble dvar;
168
168
            e->AssureScalarPar<DDoubleGDL>(2, dvar);
169
169
            ds=static_cast<size_t>(dvar);
170
170
          }
171
 
        else if(s->Type() == BYTE)
 
171
        else if(s->Type() == GDL_BYTE)
172
172
          {
173
173
            DByte bvar;
174
174
            e->AssureScalarPar<DByteGDL>(2, bvar);
175
175
            ds=static_cast<size_t>(bvar);
176
176
          }
177
 
        else if(s->Type() == STRING)
 
177
        else if(s->Type() == GDL_STRING)
178
178
          {
179
179
            DLongGDL* lsvar;
180
180
            DString sv;
181
181
            e->AssureScalarPar<DStringGDL>(2, sv);
182
 
            lsvar=static_cast<DLongGDL*>(s->Convert2(LONG,BaseGDL::COPY));
 
182
            lsvar=static_cast<DLongGDL*>(s->Convert2(GDL_LONG,BaseGDL::COPY));
183
183
            ds=static_cast<size_t>((*lsvar)[0]);
184
184
          }
185
185
 
207
207
    e->AssureLongScalarPar(0, cdfid);
208
208
 
209
209
    BaseGDL* p1 = e->GetParDefined( 1);
210
 
    if (p1->Type() != STRING) {
 
210
    if (p1->Type() != GDL_STRING) {
211
211
      // Numeric
212
212
      e->AssureLongScalarPar(1, dimid);
213
213
    } else {