diff options
| author | Tetsuo Kiso <tetsuo-s@is.naist.jp> | 2012-02-20 04:46:08 +0400 |
|---|---|---|
| committer | Tetsuo Kiso <tetsuo-s@is.naist.jp> | 2012-02-20 04:46:08 +0400 |
| commit | 47ac8a474d2746d59615fff0e42819295d6fa195 (patch) | |
| tree | 785d87fe7782013bc6ced3e08a0a61ce6247338d /mert/FeatureDataIterator.h | |
| parent | 82da44b030fd09c6923afc16ce0fcae9d7649782 (diff) | |
Change the naming conventions for the guard macros; Rename TER directory.
This change might be useful to avoid duplicating the names.
The reason is that although MERT programs are standalone
applications, some header files such as data.h and
point.h have common guard macro names like "DATA_H" and
"POINT_H", and this is not good naming conventions
when you want to include external headers.
Some files actually include headers in Moses and KenLM's util.
Diffstat (limited to 'mert/FeatureDataIterator.h')
| -rw-r--r-- | mert/FeatureDataIterator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mert/FeatureDataIterator.h b/mert/FeatureDataIterator.h index 81f072970..58345829c 100644 --- a/mert/FeatureDataIterator.h +++ b/mert/FeatureDataIterator.h @@ -17,8 +17,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ -#ifndef _FEATURE_DATA_ITERATOR_ -#define _FEATURE_DATA_ITERATOR_ +#ifndef MERT_FEATURE_DATA_ITERATOR_H_ +#define MERT_FEATURE_DATA_ITERATOR_H_ /** * For loading from the feature data file. @@ -88,4 +88,4 @@ class FeatureDataIterator : std::vector<FeatureDataItem> m_next; }; -#endif +#endif // MERT_FEATURE_DATA_ITERATOR_H_ |