Make compiler happy

sp-nitech · Oct 11, 2018 · 3a449f9 · 3a449f9
1 parent b9cbed5
commit 3a449f9
Show file tree

Hide file tree

Showing 96 changed files with 621 additions and 617 deletions.
diff --git a/src/generator/m_sequence_generation.cc b/src/generator/m_sequence_generation.cc
@@ -51,7 +51,6 @@ const int kB0(0x00000001);
 const int kB28(0x10000000);
 const int kB31(0x80000000);
 const int kB31F(0x7fffffff);
-const int kZ(0x00000000);
 
 }  // namespace
 

diff --git a/src/main/acorr.cc b/src/main/acorr.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/converter/waveform_to_autocorrelation.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/amcep.cc b/src/main/amcep.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream, std::ofstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/analyzer/adaptive_mel_cepstral_analysis.h"
 #include "SPTK/math/statistics_accumulator.h"

diff --git a/src/main/average.cc b/src/main/average.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/math/statistics_accumulator.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/b2mc.cc b/src/main/b2mc.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/converter/mlsa_digital_filter_coefficients_to_mel_cepstrum.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/bcp.cc b/src/main/bcp.cc
@@ -42,18 +42,18 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <algorithm>
-#include <cstdint>
-#include <cstring>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <limits>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <vector>
+#include <getopt.h>   // getopt_long
+#include <algorithm>  // std::max
+#include <cstdint>    // int8_t, int16_t, int32_t, int64_t, etc.
+#include <cstring>    // std::strncmp
+#include <fstream>    // std::ifstream
+#include <iomanip>    // std::setprecision, std::setw
+#include <iostream>   // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <limits>     // std::numeric_limits
+#include <sstream>    // std::ostringstream
+#include <stdexcept>  // std::invalid_argument
+#include <string>     // std::stold, std::string
+#include <vector>     // std::vector
 
 #include "SPTK/utils/int24_t.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/bcut.cc b/src/main/bcut.cc
@@ -42,15 +42,15 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <cstdint>
-#include <cstring>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <cstdint>   // int8_t, int16_t, int32_t, int64_t, etc.
+#include <cstring>   // std::strncmp
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <string>    // std::string
+#include <vector>    // std::vector
 
 #include "SPTK/utils/int24_t.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/c2acr.cc b/src/main/c2acr.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/converter/cepstrum_to_autocorrelation.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/c2mpir.cc b/src/main/c2mpir.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/converter/cepstrum_to_minimum_phase_impulse_response.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/c2ndps.cc b/src/main/c2ndps.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/converter/cepstrum_to_negative_derivative_of_phase_spectrum.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/cdist.cc b/src/main/cdist.cc
@@ -42,13 +42,13 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <cmath>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <cmath>     // std::sqrt
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/math/distance_calculator.h"
 #include "SPTK/math/statistics_accumulator.h"

diff --git a/src/main/clip.cc b/src/main/clip.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <cfloat>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
+#include <getopt.h>  // getopt_long
+#include <cfloat>    // DBL_MAX
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
 
 #include "SPTK/math/scalar_operation.h"
 #include "SPTK/utils/sptk_utils.h"
@@ -85,7 +85,7 @@ int main(int argc, char* argv[]) {
   double upper_bound(kDefaultUpperBound);
 
   for (;;) {
-    const int option_char(getopt_long_only(argc, argv, "l:u:h", NULL, NULL));
+    const int option_char(getopt_long(argc, argv, "l:u:h", NULL, NULL));
     if (-1 == option_char) break;
 
     switch (option_char) {

diff --git a/src/main/csm2acr.cc b/src/main/csm2acr.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/converter/composite_sinusoidal_modeling_to_autocorrelation.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/dct.cc b/src/main/dct.cc
@@ -42,13 +42,14 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
+#include <getopt.h>  // getopt_long
 #include <getopt.h>
-#include <cmath>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <cmath>     // std::sqrt
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/math/discrete_cosine_transform.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/decimate.cc b/src/main/decimate.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/utils/sptk_utils.h"
 

diff --git a/src/main/delay.cc b/src/main/delay.cc
@@ -42,12 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <queue>
-#include <sstream>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <queue>     // std::queue
+#include <sstream>   // std::ostringstream
 
 #include "SPTK/utils/sptk_utils.h"
 

diff --git a/src/main/dequantize.cc b/src/main/dequantize.cc
@@ -42,11 +42,11 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
 
 #include "SPTK/quantizer/inverse_uniform_quantization.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/df2.cc b/src/main/df2.cc
@@ -42,14 +42,14 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <algorithm>
-#include <cmath>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <vector>
+#include <getopt.h>   // getopt_long
+#include <algorithm>  // std::max
+#include <cmath>      // std::cos, std::exp
+#include <fstream>    // std::ifstream
+#include <iomanip>    // std::setw
+#include <iostream>   // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>    // std::ostringstream
+#include <vector>     // std::vector
 
 #include "SPTK/filter/infinite_impulse_response_digital_filter.h"
 #include "SPTK/utils/sptk_utils.h"

diff --git a/src/main/dfs.cc b/src/main/dfs.cc
@@ -42,13 +42,12 @@
 // POSSIBILITY OF SUCH DAMAGE.                                       //
 // ----------------------------------------------------------------- //
 
-#include <getopt.h>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
+#include <getopt.h>  // getopt_long
+#include <fstream>   // std::ifstream
+#include <iomanip>   // std::setw
+#include <iostream>  // std::cerr, std::cin, std::cout, std::endl, etc.
+#include <sstream>   // std::ostringstream
+#include <vector>    // std::vector
 
 #include "SPTK/filter/infinite_impulse_response_digital_filter.h"
 #include "SPTK/utils/sptk_utils.h"