Pull in C++ style headers from Jeroen Vermeulen

From Moses b3c0a29044dd873427a5aa6d38a8eafdd198a2b4 88e90957a1b56c98842769947f07d7abee95a8ec
i3thuan5 · Apr 2, 2015 · d7db0ed · d7db0ed
1 parent 0214241
commit d7db0ed
Show file tree

Hide file tree

Showing 67 changed files with 87 additions and 119 deletions.
diff --git a/lm/bhiksha.hh b/lm/bhiksha.hh
@@ -19,9 +19,8 @@
 #include "util/sorted_uniform.hh"
 
 #include <algorithm>
-
 #include <stdint.h>
-#include <assert.h>
+#include <cassert>
 
 namespace lm {
 namespace ngram {

diff --git a/lm/blank.hh b/lm/blank.hh
@@ -2,9 +2,8 @@
 #define LM_BLANK_H
 
 #include <limits>
-
 #include <stdint.h>
-#include <math.h>
+#include <cmath>
 
 namespace lm {
 namespace ngram {

diff --git a/lm/build_binary_main.cc b/lm/build_binary_main.cc
@@ -9,9 +9,8 @@
 #include <iostream>
 #include <iomanip>
 #include <limits>
-
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #ifdef WIN32
 #include "util/getopt.hh"

diff --git a/lm/builder/interpolate.cc b/lm/builder/interpolate.cc
@@ -8,8 +8,8 @@
 #include "util/fixed_array.hh"
 #include "util/murmur_hash.hh"
 
-#include <assert.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
 
 namespace lm { namespace builder {
 namespace {

diff --git a/lm/builder/joint_order.hh b/lm/builder/joint_order.hh
@@ -9,7 +9,7 @@
 #include <iostream>
 #endif
 
-#include <string.h>
+#include <cstring>
 
 namespace lm { namespace builder {
 

diff --git a/lm/builder/ngram.hh b/lm/builder/ngram.hh
@@ -5,10 +5,9 @@
 #include "lm/word_index.hh"
 
 #include <cstddef>
-
-#include <assert.h>
+#include <cassert>
 #include <stdint.h>
-#include <string.h>
+#include <cstring>
 
 namespace lm {
 namespace builder {

diff --git a/lm/builder/print.cc b/lm/builder/print.cc
@@ -7,8 +7,7 @@
 #include "util/stream/timer.hh"
 
 #include <sstream>
-
-#include <string.h>
+#include <cstring>
 
 namespace lm { namespace builder {
 

diff --git a/lm/builder/print.hh b/lm/builder/print.hh
@@ -10,8 +10,7 @@
 #include "util/string_piece.hh"
 
 #include <ostream>
-
-#include <assert.h>
+#include <cassert>
 
 // Warning: print routines read all unigrams before all bigrams before all
 // trigrams etc.  So if other parts of the chain move jointly, you'll have to

diff --git a/lm/filter/arpa_io.cc b/lm/filter/arpa_io.cc
@@ -6,9 +6,9 @@
 #include <string>
 #include <vector>
 
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
+#include <cctype>
+#include <cerrno>
+#include <cstring>
 
 namespace lm {
 

diff --git a/lm/filter/arpa_io.hh b/lm/filter/arpa_io.hh
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include <string.h>
+#include <cstring>
 #include <stdint.h>
 
 namespace util { class FilePiece; }

diff --git a/lm/filter/phrase.cc b/lm/filter/phrase.cc
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <ctype.h>
+#include <cctype>
 
 namespace lm {
 namespace phrase {

diff --git a/lm/filter/vocab.cc b/lm/filter/vocab.cc
@@ -3,7 +3,7 @@
 #include <istream>
 #include <iostream>
 
-#include <ctype.h>
+#include <cctype>
 
 namespace lm {
 namespace vocab {

diff --git a/lm/lm_exception.cc b/lm/lm_exception.cc
@@ -1,7 +1,7 @@
 #include "lm/lm_exception.hh"
 
-#include<errno.h>
-#include<stdio.h>
+#include <cerrno>
+#include <cstdio>
 
 namespace lm {
 

diff --git a/lm/model.hh b/lm/model.hh
@@ -17,8 +17,7 @@
 
 #include <algorithm>
 #include <vector>
-
-#include <string.h>
+#include <cstring>
 
 namespace util { class FilePiece; }
 

diff --git a/lm/model_test.cc b/lm/model_test.cc
@@ -1,7 +1,7 @@
 #include "lm/model.hh"
 
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #define BOOST_TEST_MODULE ModelTest
 #include <boost/test/unit_test.hpp>

diff --git a/lm/ngram_query.hh b/lm/ngram_query.hh
@@ -11,8 +11,7 @@
 #include <ostream>
 #include <istream>
 #include <string>
-
-#include <math.h>
+#include <cmath>
 
 namespace lm {
 namespace ngram {

diff --git a/lm/partial.hh b/lm/partial.hh
@@ -5,8 +5,7 @@
 #include "lm/state.hh"
 
 #include <algorithm>
-
-#include <assert.h>
+#include <cassert>
 
 namespace lm {
 namespace ngram {

diff --git a/lm/read_arpa.cc b/lm/read_arpa.cc
@@ -9,8 +9,8 @@
 #include <sstream>
 #include <vector>
 
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 #include <stdint.h>
 
 #ifdef WIN32

diff --git a/lm/search_trie.hh b/lm/search_trie.hh
@@ -12,8 +12,7 @@
 
 #include <vector>
 #include <cstdlib>
-
-#include <assert.h>
+#include <cassert>
 
 namespace lm {
 namespace ngram {

diff --git a/lm/state.hh b/lm/state.hh
@@ -5,7 +5,7 @@
 #include "lm/word_index.hh"
 #include "util/murmur_hash.hh"
 
-#include <string.h>
+#include <cstring>
 
 namespace lm {
 namespace ngram {

diff --git a/lm/trie.cc b/lm/trie.cc
@@ -5,7 +5,7 @@
 #include "util/exception.hh"
 #include "util/sorted_uniform.hh"
 
-#include <assert.h>
+#include <cassert>
 
 namespace lm {
 namespace ngram {

diff --git a/lm/virtual_interface.hh b/lm/virtual_interface.hh
@@ -6,7 +6,7 @@
 #include "util/string_piece.hh"
 
 #include <string>
-#include <string.h>
+#include <cstring>
 
 namespace lm {
 namespace base {

diff --git a/lm/vocab.cc b/lm/vocab.cc
@@ -12,8 +12,7 @@
 #include "util/probing_hash_table.hh"
 
 #include <string>
-
-#include <string.h>
+#include <cstring>
 
 namespace lm {
 namespace ngram {

diff --git a/lm/word_index.hh b/lm/word_index.hh
@@ -2,7 +2,7 @@
 #ifndef LM_WORD_INDEX_H
 #define LM_WORD_INDEX_H
 
-#include <limits.h>
+#include <climits>
 
 namespace lm {
 typedef unsigned int WordIndex;

diff --git a/lm/wrappers/nplm.cc b/lm/wrappers/nplm.cc
@@ -3,8 +3,7 @@
 #include "util/file.hh"
 
 #include <algorithm>
-
-#include <string.h>
+#include <cstring>
 
 #include "neuralLM.h"
 

diff --git a/util/bit_packing.cc b/util/bit_packing.cc
@@ -1,7 +1,7 @@
 #include "util/bit_packing.hh"
 #include "util/exception.hh"
 
-#include <string.h>
+#include <cstring>
 
 namespace util {
 

diff --git a/util/bit_packing.hh b/util/bit_packing.hh
@@ -18,7 +18,7 @@
  * NICT.
  */
 
-#include <assert.h>
+#include <cassert>
 #ifdef __APPLE__
 #include <architecture/byte_order.h>
 #elif __linux__
@@ -28,8 +28,7 @@
 #endif 
 
 #include <stdint.h>
-
-#include <string.h>
+#include <cstring>
 
 namespace util {
 

diff --git a/util/bit_packing_test.cc b/util/bit_packing_test.cc
@@ -3,7 +3,7 @@
 #define BOOST_TEST_MODULE BitPackingTest
 #include <boost/test/unit_test.hpp>
 
-#include <string.h>
+#include <cstring>
 
 namespace util {
 namespace {

diff --git a/util/cat_compressed_main.cc b/util/cat_compressed_main.cc
@@ -2,7 +2,7 @@
 #include "util/file.hh"
 #include "util/read_compressed.hh"
 
-#include <string.h>
+#include <cstring>
 #include <iostream>
 
 namespace {

diff --git a/util/double-conversion/bignum-dtoa.cc b/util/double-conversion/bignum-dtoa.cc
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <math.h>
+#include <cmath>
 
 #include "bignum-dtoa.h"
 

diff --git a/util/double-conversion/cached-powers.cc b/util/double-conversion/cached-powers.cc
@@ -25,9 +25,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdarg.h>
-#include <limits.h>
-#include <math.h>
+#include <cstdarg>
+#include <climits>
+#include <cmath>
 
 #include "utils.h"
 

diff --git a/util/double-conversion/double-conversion.cc b/util/double-conversion/double-conversion.cc
@@ -25,8 +25,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <limits.h>
-#include <math.h>
+#include <climits>
+#include <cmath>
 
 #include "double-conversion.h"
 

diff --git a/util/double-conversion/fixed-dtoa.cc b/util/double-conversion/fixed-dtoa.cc
@@ -25,7 +25,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <math.h>
+#include <cmath>
 
 #include "fixed-dtoa.h"
 #include "ieee.h"

diff --git a/util/double-conversion/strtod.cc b/util/double-conversion/strtod.cc
@@ -25,8 +25,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <stdarg.h>
-#include <limits.h>
+#include <cstdarg>
+#include <climits>
 
 #include "strtod.h"
 #include "bignum.h"

diff --git a/util/ersatz_progress.hh b/util/ersatz_progress.hh
@@ -3,7 +3,6 @@
 
 #include <iostream>
 #include <string>
-
 #include <stdint.h>
 
 // Ersatz version of boost::progress so core language model doesn't depend on

diff --git a/util/exception.cc b/util/exception.cc
@@ -4,8 +4,8 @@
 #include <typeinfo>
 #endif
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 namespace util {
 

diff --git a/util/exception.hh b/util/exception.hh
@@ -5,7 +5,6 @@
 #include <limits>
 #include <sstream>
 #include <string>
-
 #include <stdint.h>
 
 namespace util {

diff --git a/util/file.cc b/util/file.cc
@@ -13,9 +13,9 @@
 #include <sstream>
 
 
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
+#include <cassert>
+#include <cerrno>
+#include <climits>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>