entry.h   entry.h 
skipping to change at line 227 skipping to change at line 227
gd_triplet_t zero; gd_triplet_t zero;
zero.r = 0; zero.r = 0;
return (E.field_type == GD_WINDOW_ENTRY) ? E.u.window.threshold : z ero; return (E.field_type == GD_WINDOW_ENTRY) ? E.u.window.threshold : z ero;
} }
/* MPLEX methods */ /* MPLEX methods */
virtual int CountVal() const { virtual int CountVal() const {
return (E.field_type == GD_MPLEX_ENTRY) ? E.u.mplex.count_val : 0; return (E.field_type == GD_MPLEX_ENTRY) ? E.u.mplex.count_val : 0;
} }
virtual int CountMax() const { virtual int Period() const {
return (E.field_type == GD_MPLEX_ENTRY) ? E.u.mplex.count_max : 0; return (E.field_type == GD_MPLEX_ENTRY) ? E.u.mplex.period : 0;
} }
/* deprecated member alias */
virtual int gd_deprecated CountMax() const { return Period(); }
/* Set methods */ /* Set methods */
void SetName(const char* name); void SetName(const char* name);
void SetFragmentIndex(int fragment_index); void SetFragmentIndex(int fragment_index);
protected: protected:
Entry(const Dirfile *dirfile, const char* field_code); Entry(const Dirfile *dirfile, const char* field_code);
static int CheckIndex(gd_entype_t field_type, int n_fields, static int CheckIndex(gd_entype_t field_type, int n_fields,
int index); int index);
 End of changes. 2 change blocks. 
2 lines changed or deleted 5 lines changed or added


 getdata.h   getdata.h 
skipping to change at line 398 skipping to change at line 398
} GD_ANON(linterp); } GD_ANON(linterp);
struct { /* PHASE */ struct { /* PHASE */
gd_shift_t shift; gd_shift_t shift;
} GD_ANON(phase); } GD_ANON(phase);
struct { /* WINDOW */ struct { /* WINDOW */
gd_windop_t windop; gd_windop_t windop;
gd_triplet_t threshold; gd_triplet_t threshold;
} GD_ANON(window); } GD_ANON(window);
struct { /* MPLEX */ struct { /* MPLEX */
int count_val; int count_val;
int count_max; int period;
} GD_ANON(mplex); } GD_ANON(mplex);
struct { /* CONST */ struct { /* CONST */
gd_type_t const_type; gd_type_t const_type;
size_t array_len; size_t array_len;
} GD_ANON(scalar); } GD_ANON(scalar);
} GD_ANON(u); } GD_ANON(u);
struct gd_private_entry_ *e; struct gd_private_entry_ *e;
}; };
skipping to change at line 550 skipping to change at line 550
extern int gd_add_lincom(DIRFILE *dirfile, const char *field_code, int n_fi elds, extern int gd_add_lincom(DIRFILE *dirfile, const char *field_code, int n_fi elds,
const char **in_fields, const double *m, const double *b, const char **in_fields, const double *m, const double *b,
int fragment_index) gd_nothrow gd_nonnull ((1,2,4,5,6)); int fragment_index) gd_nothrow gd_nonnull ((1,2,4,5,6));
extern int gd_add_linterp(DIRFILE *dirfile, const char *field_code, extern int gd_add_linterp(DIRFILE *dirfile, const char *field_code,
const char *in_field, const char *table, int fragment_index) gd_nothrow const char *in_field, const char *table, int fragment_index) gd_nothrow
gd_nonnull ((1,2,3,4)); gd_nonnull ((1,2,3,4));
extern int gd_add_mplex(DIRFILE *dirfile, const char *field_code, extern int gd_add_mplex(DIRFILE *dirfile, const char *field_code,
const char *in_field, const char *count_field, int count_val, int count _max, const char *in_field, const char *count_field, int count_val, int perio d,
int fragment_index) gd_nothrow gd_nonnull ((1,2,3,4)); int fragment_index) gd_nothrow gd_nonnull ((1,2,3,4));
extern int gd_add_multiply(DIRFILE *dirfile, const char *field_code, extern int gd_add_multiply(DIRFILE *dirfile, const char *field_code,
const char *in_field1, const char *in_field2, int fragment_index) const char *in_field1, const char *in_field2, int fragment_index)
gd_nothrow gd_nonnull ((1,2,3,4)); gd_nothrow gd_nonnull ((1,2,3,4));
extern int gd_add_phase(DIRFILE *dirfile, const char *field_code, extern int gd_add_phase(DIRFILE *dirfile, const char *field_code,
const char *in_field, gd_shift_t shift, int fragment_index) gd_nothrow const char *in_field, gd_shift_t shift, int fragment_index) gd_nothrow
gd_nonnull ((1,2,3)); gd_nonnull ((1,2,3));
skipping to change at line 629 skipping to change at line 629
extern int gd_alter_divide(DIRFILE *dirfile, const char *field_code, extern int gd_alter_divide(DIRFILE *dirfile, const char *field_code,
const char *in_field1, const char *in_field2) gd_nothrow gd_nonnull((1, 2)); const char *in_field1, const char *in_field2) gd_nothrow gd_nonnull((1, 2));
extern int gd_alter_lincom(DIRFILE *dirfile, const char *field_code, extern int gd_alter_lincom(DIRFILE *dirfile, const char *field_code,
int n_fields, const char **in_fields, const double *m, const double *b) int n_fields, const char **in_fields, const double *m, const double *b)
gd_nothrow gd_nonnull((1,2)); gd_nothrow gd_nonnull((1,2));
extern int gd_alter_mplex(DIRFILE *dirfile, const char *field_code, extern int gd_alter_mplex(DIRFILE *dirfile, const char *field_code,
const char *in_field, const char *count_field, int count_val, const char *in_field, const char *count_field, int count_val,
int count_max) gd_nothrow gd_nonnull((1,2)); int period) gd_nothrow gd_nonnull((1,2));
extern int gd_alter_multiply(DIRFILE *dirfile, const char *field_code, extern int gd_alter_multiply(DIRFILE *dirfile, const char *field_code,
const char *in_field1, const char *in_field2) gd_nothrow gd_nonnull((1, 2)); const char *in_field1, const char *in_field2) gd_nothrow gd_nonnull((1, 2));
extern int gd_alter_phase(DIRFILE *dirfile, const char *field_code, extern int gd_alter_phase(DIRFILE *dirfile, const char *field_code,
const char *in_field, gd_shift_t shift) gd_nothrow gd_nonnull((1,2)); const char *in_field, gd_shift_t shift) gd_nothrow gd_nonnull((1,2));
extern int gd_alter_polynom(DIRFILE *dirfile, const char *field_code, extern int gd_alter_polynom(DIRFILE *dirfile, const char *field_code,
int poly_ord, const char *in_field, const double *a) gd_nothrow int poly_ord, const char *in_field, const double *a) gd_nothrow
gd_nonnull((1,2)); gd_nonnull((1,2));
skipping to change at line 790 skipping to change at line 790
extern int gd_madd_lincom(DIRFILE *dirfile, const char *parent, extern int gd_madd_lincom(DIRFILE *dirfile, const char *parent,
const char *field_code, int n_fields, const char **in_fields, const char *field_code, int n_fields, const char **in_fields,
const double *m, const double *b) gd_nothrow gd_nonnull((1,2,3,5,6,7)); const double *m, const double *b) gd_nothrow gd_nonnull((1,2,3,5,6,7));
extern int gd_madd_linterp(DIRFILE *dirfile, const char *parent, extern int gd_madd_linterp(DIRFILE *dirfile, const char *parent,
const char *field_code, const char *in_field, const char *table) const char *field_code, const char *in_field, const char *table)
gd_nothrow gd_nonnull ((1,2,3,4,5)); gd_nothrow gd_nonnull ((1,2,3,4,5));
extern int gd_madd_mplex(DIRFILE *dirfile, const char *parent, extern int gd_madd_mplex(DIRFILE *dirfile, const char *parent,
const char *field_code, const char *in_field, const char *count_field, const char *field_code, const char *in_field, const char *count_field,
int count_val, int count_max) gd_nothrow int count_val, int period) gd_nothrow
gd_nonnull ((1,2,3,4,5)); gd_nonnull ((1,2,3,4,5));
extern int gd_madd_multiply(DIRFILE *dirfile, const char *parent, extern int gd_madd_multiply(DIRFILE *dirfile, const char *parent,
const char *field_code, const char *in_field1, const char *in_field2) const char *field_code, const char *in_field1, const char *in_field2)
gd_nothrow gd_nonnull ((1,2,3,4,5)); gd_nothrow gd_nonnull ((1,2,3,4,5));
extern int gd_madd_phase(DIRFILE *dirfile, const char *parent, extern int gd_madd_phase(DIRFILE *dirfile, const char *parent,
const char *field_code, const char *in_field, gd_shift_t shift) const char *field_code, const char *in_field, gd_shift_t shift)
gd_nothrow gd_nonnull ((1,2,3,4)); gd_nothrow gd_nonnull ((1,2,3,4));
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 mplexentry.h   mplexentry.h 
skipping to change at line 38 skipping to change at line 38
class Dirfile; class Dirfile;
class MplexEntry : public Entry { class MplexEntry : public Entry {
friend class Dirfile; friend class Dirfile;
public: public:
MplexEntry() : Entry() { E.field_type = GD_MPLEX_ENTRY; }; MplexEntry() : Entry() { E.field_type = GD_MPLEX_ENTRY; };
MplexEntry(const char* field_code, const char* in_field, MplexEntry(const char* field_code, const char* in_field,
const char *check_Field, int count_val, int count_max, const char *check_field, int count_val, int period,
int fragment_index = 0); int fragment_index = 0);
virtual const char *Input(int index = 0) const { virtual const char *Input(int index = 0) const {
return E.in_fields[(index == 0) ? 0 : 1]; return E.in_fields[(index == 0) ? 0 : 1];
}; };
virtual const char *Scalar() const { return E.scalar[0]; } virtual const char *Scalar() const { return E.scalar[0]; }
virtual int ScalarIndex() const { return E.scalar_ind[0]; }; virtual int ScalarIndex() const { return E.scalar_ind[0]; };
virtual int CountVal() const { return E.u.mplex.count_val; }; virtual int CountVal() const { return E.u.mplex.count_val; };
virtual int CountMax() const { return E.u.mplex.count_max; }; virtual int Period() const { return E.u.mplex.period; };
int SetInput(const char* field, int index); int SetInput(const char* field, int index);
virtual int SetCountVal(int count_val); virtual int SetCountVal(int count_val);
virtual int SetCountVal(const char* count_val); virtual int SetCountVal(const char* count_val);
virtual int SetCountMax(int count_max); virtual int SetPeriod(int period);
virtual int SetCountMax(const char* count_max); virtual int SetPeriod(const char* period);
/* deprecated member aliases */
virtual int gd_deprecated CountMax() const { return Period(); };
virtual int gd_deprecated SetCountMax(int period) {
return SetPeriod(period);
}
virtual int gd_deprecated SetCountMax(const char* period) {
return SetPeriod(period);
};
private: private:
MplexEntry(const GetData::Dirfile *dirfile, const char* field_code) : MplexEntry(const GetData::Dirfile *dirfile, const char* field_code) :
Entry(dirfile, field_code) { }; Entry(dirfile, field_code) { };
}; };
} }
#endif #endif
 End of changes. 3 change blocks. 
4 lines changed or deleted 13 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/