Modernize "C" includes in moses.

This is one of those little chores in managing a long-lived C++ project: standard C headers like stdio.h and math.h now have their own place in the C++ standard as resp. cstdio, cmath, and so on. In this branch the #include names are updated for the moses/ subdirectory; more branches to follow. C++11 adds cstdint, but to support compilation with the previous standard, that change is left for later.
2024-08-16 15:00:33 +03:00 · 2015-03-28 20:09:03 +07:00 · 2015-03-28 20:09:03 +07:00 · a9c8f44896
commit a9c8f44896
parent 9852a0c2ff
29 changed files with 38 additions and 38 deletions
--- a/moses/ChartManager.cpp
+++ b/moses/ChartManager.cpp
@ -19,7 +19,7 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/

-#include <stdio.h>
+#include <cstdio>
 #include "ChartManager.h"
 #include "ChartCell.h"
 #include "ChartHypothesis.h"
--- a/moses/FF/ExternalFeature.cpp
+++ b/moses/FF/ExternalFeature.cpp
@ -1,6 +1,6 @@
 #include "ExternalFeature.h"
 #include <dlfcn.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <iostream>
 #include "util/exception.hh"

--- a/moses/FF/SoftSourceSyntacticConstraintsFeature.cpp
+++ b/moses/FF/SoftSourceSyntacticConstraintsFeature.cpp
@ -1,6 +1,6 @@
 #include <vector>
 #include <limits>
-#include <assert.h>
+#include <cassert>
 #include "SoftSourceSyntacticConstraintsFeature.h"
 #include "moses/StaticData.h"
 #include "moses/InputFileStream.h"
--- a/moses/FF/SourceGHKMTreeInputMatchFeature.cpp
+++ b/moses/FF/SourceGHKMTreeInputMatchFeature.cpp
@ -1,6 +1,6 @@
 #include <map>
 #include <vector>
-#include <assert.h>
+#include <cassert>
 #include "SourceGHKMTreeInputMatchFeature.h"
 #include "moses/StaticData.h"
 #include "moses/InputFileStream.h"
--- a/moses/LM/Ken.cpp
+++ b/moses/LM/Ken.cpp
@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <cstring>
 #include <iostream>
 #include <memory>
-#include <stdlib.h>
+#include <cstdlib>
 #include <boost/shared_ptr.hpp>
 #include <boost/lexical_cast.hpp>

--- a/moses/LM/Remote.cpp
+++ b/moses/LM/Remote.cpp
@ -1,5 +1,5 @@
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
--- a/moses/PP/CountsPhraseProperty.cpp
+++ b/moses/PP/CountsPhraseProperty.cpp
@ -1,6 +1,6 @@
 #include "moses/PP/CountsPhraseProperty.h"
 #include <sstream>
-#include <assert.h>
+#include <cassert>

 namespace Moses
 {
--- a/moses/PP/NonTermContextProperty.cpp
+++ b/moses/PP/NonTermContextProperty.cpp
@ -1,6 +1,6 @@
 #include "moses/PP/NonTermContextProperty.h"
 #include <string>
-#include <assert.h>
+#include <cassert>
 #include "moses/Util.h"
 #include "moses/FactorCollection.h"

--- a/moses/PP/SourceLabelsPhraseProperty.cpp
+++ b/moses/PP/SourceLabelsPhraseProperty.cpp
@ -5,7 +5,7 @@
 #include <sstream>
 #include <string>
 #include <queue>
-#include <assert.h>
+#include <cassert>
 #include <limits>

 namespace Moses
--- a/moses/SentenceStats.h
+++ b/moses/SentenceStats.h
@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <iostream>
 #include <string>
 #include <vector>
-#include <time.h>
+#include <ctime>
 #include "Timer.h"
 #include "Phrase.h"
 #include "Hypothesis.h"
--- a/moses/Syntax/F2S/HyperTreeLoader.cpp
+++ b/moses/Syntax/F2S/HyperTreeLoader.cpp
@ -3,7 +3,7 @@
 #include <sys/stat.h>

 #include <cmath>
-#include <stdlib.h>
+#include <cstdlib>
 #include <fstream>
 #include <string>
 #include <iterator>
--- a/moses/Syntax/S2T/RuleTrieLoader.cpp
+++ b/moses/Syntax/S2T/RuleTrieLoader.cpp
@ -1,14 +1,14 @@
 #include "RuleTrieLoader.h"

 #include <sys/stat.h>
-#include <stdlib.h>
+#include <cstdlib>

 #include <fstream>
 #include <string>
 #include <iterator>
 #include <algorithm>
 #include <iostream>
-#include <math.h>
+#include <cmath>

 #include "moses/FactorCollection.h"
 #include "moses/Word.h"
--- a/moses/TargetPhrase.cpp
+++ b/moses/TargetPhrase.cpp
@ -20,7 +20,7 @@
 ***********************************************************************/

 #include <algorithm>
-#include <stdlib.h>
+#include <cstdlib>
 #include "util/exception.hh"
 #include "util/tokenize_piece.hh"

--- a/moses/TranslationModel/CompactPT/BlockHashIndex.h
+++ b/moses/TranslationModel/CompactPT/BlockHashIndex.h
@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #ifdef WITH_THREADS
 #include "moses/ThreadPool.h"
 #else
-#include <time.h>
+#include <ctime>
 #endif

 #include <boost/shared_ptr.hpp>
--- a/moses/TranslationModel/CompactPT/MurmurHash3.cpp
+++ b/moses/TranslationModel/CompactPT/MurmurHash3.cpp
@ -18,7 +18,7 @@

 #define FORCE_INLINE	__forceinline

-#include <stdlib.h>
+#include <cstdlib>

 #define ROTL32(x,y)	_rotl(x,y)
 #define ROTL64(x,y)	_rotl64(x,y)
--- a/moses/TranslationModel/DynSAInclude/FileHandler.cpp
+++ b/moses/TranslationModel/DynSAInclude/FileHandler.cpp
@ -1,5 +1,5 @@
 #include "FileHandler.h"
-#include <stdio.h>
+#include <cstdio>

 #ifdef WIN32
 #define popen(A, B) _popen(A, B)
--- a/moses/TranslationModel/PhraseDictionary.h
+++ b/moses/TranslationModel/PhraseDictionary.h
@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <boost/thread/tss.hpp>
 #else
 #include <boost/scoped_ptr.hpp>
-#include <time.h>
+#include <ctime>
 #endif

 #include "moses/Phrase.h"
--- a/moses/TranslationModel/PhraseDictionaryTransliteration.cpp
+++ b/moses/TranslationModel/PhraseDictionaryTransliteration.cpp
@ -1,5 +1,5 @@
 // vim:tabstop=2
-#include <stdlib.h>
+#include <cstdlib>
 #include "PhraseDictionaryTransliteration.h"
 #include "moses/TranslationModel/CYKPlusParser/ChartRuleLookupManagerSkeleton.h"
 #include "moses/DecodeGraph.h"
--- a/moses/TranslationModel/ProbingPT/huffmanish.hh
+++ b/moses/TranslationModel/ProbingPT/huffmanish.hh
@ -3,7 +3,7 @@
 //Huffman encodes a line and also produces the vocabulary ids
 #include "hash.hh"
 #include "line_splitter.hh"
-#include <stdio.h>
+#include <cstdio>
 #include <fstream>
 #include <iostream>
 #include <sstream>
--- a/moses/TranslationModel/ProbingPT/line_splitter.hh
+++ b/moses/TranslationModel/ProbingPT/line_splitter.hh
@ -4,7 +4,7 @@
 #include "util/tokenize_piece.hh"
 #include "util/file_piece.hh"
 #include <vector>
-#include <stdlib.h> //atof
+#include <cstdlib> //atof
 #include "util/string_piece.hh"  //Tokenization and work with StringPiece
 #include "util/tokenize_piece.hh"
 #include <vector>
--- a/moses/TranslationModel/ProbingPT/storing.hh
+++ b/moses/TranslationModel/ProbingPT/storing.hh
@ -1,6 +1,6 @@
 #pragma once

-#include <stdio.h>
+#include <cstdio>
 #include <fstream>
 #include <iostream>  

--- a/moses/TranslationModel/RuleTable/LoaderStandard.cpp
+++ b/moses/TranslationModel/RuleTable/LoaderStandard.cpp
@ -25,7 +25,7 @@
 #include <algorithm>
 #include <iostream>
 #include <sys/stat.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <boost/algorithm/string/predicate.hpp>
 #include "Trie.h"
 #include "moses/FactorCollection.h"
--- a/moses/TranslationModel/RuleTable/PhraseDictionaryFuzzyMatch.cpp
+++ b/moses/TranslationModel/RuleTable/PhraseDictionaryFuzzyMatch.cpp
@ -19,10 +19,10 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/

-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <climits>
 #include <sys/types.h>
 #include <unistd.h>
 #include <dirent.h>
@ -50,7 +50,7 @@ using namespace std;

 #if defined __MINGW32__ && !defined mkdtemp
 #include <windows.h>
-#include <errno.h>
+#include <cerrno>
 char *mkdtemp(char *tempbuf)
 {
  int rand_value = 0;
--- a/moses/TranslationModel/UG/mm/tpt_tightindex.cc
+++ b/moses/TranslationModel/UG/mm/tpt_tightindex.cc
@ -17,7 +17,7 @@
 //

 #include <iostream>
-#include <assert.h>
+#include <cassert>
 #include "tpt_tightindex.h"

 namespace ugdiss
--- a/moses/TranslationModel/UG/mm/tpt_tokenindex.cc
+++ b/moses/TranslationModel/UG/mm/tpt_tokenindex.cc
@ -1,7 +1,7 @@
 // -*- c++ -*-
 // (c) 2007-2013 Ulrich Germann
 #include <sstream>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 #include <iostream>
 #include <stdexcept>
--- a/moses/TranslationModel/UG/mmsapt.h
+++ b/moses/TranslationModel/UG/mmsapt.h
@ -3,7 +3,7 @@
 // Design and code by Ulrich Germann.
 #pragma once

-#include <time.h>
+#include <ctime>
 #include <boost/thread.hpp>
 #include <boost/scoped_ptr.hpp>

--- a/moses/TranslationModel/fuzzy-match/Vocabulary.h
+++ b/moses/TranslationModel/fuzzy-match/Vocabulary.h
@ -4,8 +4,8 @@

 #include <iostream>
 #include <fstream>
-#include <assert.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstdlib>
 #include <string>
 #include <queue>
 #include <map>
--- a/moses/Util.cpp
+++ b/moses/Util.cpp
@ -29,7 +29,7 @@
 #include <cstring>
 #include <cctype>
 #include <algorithm>
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
 #include <iomanip>
 #include <boost/algorithm/string/predicate.hpp>
--- a/moses/mbr.cpp
+++ b/moses/mbr.cpp
@ -4,10 +4,10 @@
 #include <iomanip>
 #include <vector>
 #include <map>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdlib>
+#include <cmath>
 #include <algorithm>
-#include <stdio.h>
+#include <cstdio>
 #include "moses/TrellisPathList.h"
 #include "moses/TrellisPath.h"
 #include "moses/StaticData.h"