Use const instead of #define macros if possible.

scripts/ems/biconcor/Alignment.cpp

@@ -3,6 +3,12 @@
 #include <stdlib.h>
 #include <cstring>
 
+namespace {
+
+const int LINE_MAX_LENGTH = 10000;
+
+} // namespace
+
 using namespace std;
 
 void Alignment::Create( string fileName )

scripts/ems/biconcor/Alignment.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#define LINE_MAX_LENGTH 10000
 #include "Vocabulary.h"
 
 class Alignment

scripts/ems/biconcor/SuffixArray.cpp

@@ -3,6 +3,12 @@
 #include <stdlib.h>
 #include <cstring>
 
+namespace {
+
+const int LINE_MAX_LENGTH = 10000;
+
+} // namespace
+
 using namespace std;
 
 void SuffixArray::Create( string fileName )

scripts/ems/biconcor/SuffixArray.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#define LINE_MAX_LENGTH 10000
-
 #include "Vocabulary.h"
 
 class SuffixArray

scripts/ems/biconcor/TargetCorpus.cpp

@@ -1,8 +1,17 @@
 #include "TargetCorpus.h"
+
 #include <string>
 #include <stdlib.h>
 #include <cstring>
 
+namespace {
+
+const int LINE_MAX_LENGTH = 10000;
+
+} // namespace
+
+using namespace std;
+
 void TargetCorpus::Create( string fileName )
 {
   ifstream textFile;

scripts/ems/biconcor/TargetCorpus.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#define LINE_MAX_LENGTH 10000
 #include "Vocabulary.h"
 
 class TargetCorpus

scripts/ems/biconcor/Vocabulary.cpp

@@ -1,6 +1,14 @@
 // $Id: Vocabulary.cpp 1565 2008-02-22 14:42:01Z bojar $
 #include "Vocabulary.h"
 
+namespace {
+
+const int MAX_LENGTH = 10000;
+
+} // namespace
+
+using namespace std;
+
 // as in beamdecoder/tables.cpp
 vector<WORD_ID> Vocabulary::Tokenize( const char input[] )
 {

scripts/ems/biconcor/Vocabulary.h

@@ -10,11 +10,10 @@
 #include <queue>
 #include <map>
 #include <cmath>
+#include <vector>
 
 using namespace std;
 
-#define MAX_LENGTH 10000
-
 #define SAFE_GETLINE(_IS, _LINE, _SIZE, _DELIM) { \
                 _IS.getline(_LINE, _SIZE, _DELIM); \
                 if(_IS.fail() && !_IS.bad() && !_IS.eof()) _IS.clear(); \

scripts/ems/biconcor/biconcor.cpp

@@ -118,4 +118,6 @@ int main(int argc, char* argv[])
     ppCollection.GetCollection( queryString );
     ppCollection.PrintHTML();
   }
+
+  return 0;
 }