diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-04 20:27:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-04 20:27:22 +0000 |
| commit | e488bc443b681c8d1a36667e5d3caa4e42c28baf (patch) | |
| tree | ac1f7f0e8b1bf1406a96e48e4f020ddd110b2180 | |
| parent | d2f6f86330b68500a4e0c7987ff2bb1493a7ea8d (diff) | |
cppcheck: duplInheritedMember
Change-Id: I451a7a04fd1578d3095e5931f0792a32870a647e
| -rw-r--r-- | hwpfilter/source/hbox.cxx | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hbox.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx index fb3037d4eefb..beef2014327a 100644 --- a/hwpfilter/source/hbox.cxx +++ b/hwpfilter/source/hbox.cxx @@ -331,7 +331,7 @@ TxtBox::TxtBox() , dummy(0) , dummy1(0) , cap_len(0) - , next(0) + , next_box(0) , dummy2(0) , reserved1(0) , cap_pos(0) diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h index f8fbd6e6c305..36b8a146467f 100644 --- a/hwpfilter/source/hbox.h +++ b/hwpfilter/source/hbox.h @@ -336,7 +336,7 @@ struct TxtBox: public FBox short dummy1; // to not change structure size */ short cap_len; - short next; + short next_box; short dummy2; // to not change structure size */ unsigned char reserved1; /** |