use constexpr instead of define / use pragma once

Summary: See title. Reviewed By: wickedfoo Differential Revision: D5559236 fbshipit-source-id: 932c1e548a31c2defb4ab20c4c897b27ab4a55f0
jattenberg · Nov 30, 2017 · 8ca5bf0 · 8ca5bf0
1 parent 520b59d
commit 8ca5bf0
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 64 deletions.
diff --git a/src/args.h b/src/args.h
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_ARGS_H
-#define FASTTEXT_ARGS_H
+#pragma once
 
 #include <istream>
 #include <ostream>
@@ -17,8 +16,8 @@
 
 namespace fasttext {
 
-enum class model_name : int {cbow=1, sg, sup};
-enum class loss_name : int {hs=1, ns, softmax};
+enum class model_name : int { cbow = 1, sg, sup };
+enum class loss_name : int { hs = 1, ns, softmax };
 
 class Args {
   protected:
@@ -50,22 +49,19 @@ class Args {
     std::string pretrainedVectors;
     int saveOutput;
 
-    bool qout;
-    bool retrain;
-    bool qnorm;
-    size_t cutoff;
-    size_t dsub;
+  bool qout;
+  bool retrain;
+  bool qnorm;
+  size_t cutoff;
+  size_t dsub;
 
-    void parseArgs(const std::vector<std::string>& args);
-    void printHelp();
-    void printBasicHelp();
-    void printDictionaryHelp();
-    void printTrainingHelp();
-    void printQuantizationHelp();
-    void save(std::ostream&);
-    void load(std::istream&);
+  void parseArgs(const std::vector<std::string>& args);
+  void printHelp();
+  void printBasicHelp();
+  void printDictionaryHelp();
+  void printTrainingHelp();
+  void printQuantizationHelp();
+  void save(std::ostream&);
+  void load(std::istream&);
 };
-
 }
-
-#endif
diff --git a/src/dictionary.h b/src/dictionary.h
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_DICTIONARY_H
-#define FASTTEXT_DICTIONARY_H
+#pragma once
 
 #include <vector>
 #include <string>
@@ -108,5 +107,3 @@ class Dictionary {
 };
 
 }
-
-#endif
diff --git a/src/fasttext.cc b/src/fasttext.cc
@@ -25,6 +25,9 @@
 
 namespace fasttext {
 
+constexpr int32_t FASTTEXT_VERSION = 12; /* Version 1b */
+constexpr int32_t FASTTEXT_FILEFORMAT_MAGIC_INT32 = 793712314;
+
 FastText::FastText() : quant_(false) {}
 
 void FastText::addInputVector(Vector& vec, int32_t ind) const {

diff --git a/src/fasttext.h b/src/fasttext.h
@@ -7,11 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_FASTTEXT_H
-#define FASTTEXT_FASTTEXT_H
-
-#define FASTTEXT_VERSION 12 /* Version 1b */
-#define FASTTEXT_FILEFORMAT_MAGIC_INT32 793712314
+#pragma once
 
 #include <time.h>
 
@@ -110,6 +106,4 @@ class FastText {
   int getDimension() const;
   bool isQuant() const;
 };
-
-} // namespace fasttext
-#endif
+}
diff --git a/src/matrix.h b/src/matrix.h
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_MATRIX_H
-#define FASTTEXT_MATRIX_H
+#pragma once
 
 #include <cstdint>
 #include <istream>
@@ -53,5 +52,3 @@ class Matrix {
 };
 
 }
-
-#endif
diff --git a/src/model.cc b/src/model.cc
@@ -15,6 +15,10 @@
 
 namespace fasttext {
 
+constexpr int32_t SIGMOID_TABLE_SIZE = 512;
+constexpr int32_t MAX_SIGMOID = 8;
+constexpr int32_t LOG_TABLE_SIZE = 512;
+
 Model::Model(std::shared_ptr<Matrix> wi,
              std::shared_ptr<Matrix> wo,
              std::shared_ptr<Args> args,

diff --git a/src/model.h b/src/model.h
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_MODEL_H
-#define FASTTEXT_MODEL_H
+#pragma once
 
 #include <vector>
 #include <random>
@@ -21,10 +20,6 @@
 #include "qmatrix.h"
 #include "real.h"
 
-#define SIGMOID_TABLE_SIZE 512
-#define MAX_SIGMOID 8
-#define LOG_TABLE_SIZE 512
-
 namespace fasttext {
 
 struct Node {
@@ -107,5 +102,3 @@ class Model {
 };
 
 }
-
-#endif
diff --git a/src/productquantizer.h b/src/productquantizer.h
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_PRODUCT_QUANTIZER_H
-#define FASTTEXT_PRODUCT_QUANTIZER_H
+#pragma once
 
 #include <cstring>
 #include <istream>
@@ -63,5 +62,3 @@ class ProductQuantizer {
 };
 
 }
-
-#endif
diff --git a/src/qmatrix.h b/src/qmatrix.h
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_QMATRIX_H
-#define FASTTEXT_QMATRIX_H
+#pragma once
 
 #include <cstdint>
 #include <istream>
@@ -61,5 +60,3 @@ class QMatrix {
 };
 
 }
-
-#endif
diff --git a/src/real.h b/src/real.h
@@ -7,13 +7,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_REAL_H
-#define FASTTEXT_REAL_H
+#pragma once
 
 namespace fasttext {
 
 typedef float real;
 
 }
-
-#endif
diff --git a/src/utils.h b/src/utils.h
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_UTILS_H
-#define FASTTEXT_UTILS_H
+#pragma once
 
 #include <fstream>
 
@@ -29,5 +28,3 @@ namespace utils {
 }
 
 }
-
-#endif
diff --git a/src/vector.h b/src/vector.h
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#ifndef FASTTEXT_VECTOR_H
-#define FASTTEXT_VECTOR_H
+#pragma once
 
 #include <cstdint>
 #include <ostream>
@@ -49,5 +48,3 @@ class Vector {
 std::ostream& operator<<(std::ostream&, const Vector&);
 
 }
-
-#endif