From: Rossen Apostolov <rossen@kth.se>
Date: Wed, 3 Sep 2014 09:54:39 +0000 (+0200)
Subject: Converted fft files to C++.
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=7e42b5f33fa14c6afeca3236e6bb028677b9373c

Converted fft files to C++.

Change-Id: I33609cb7019b216f1f675110ecc37bdd882dcfa5
---

diff --git a/src/gromacs/fft/CMakeLists.txt b/src/gromacs/fft/CMakeLists.txt
index cb5a51f736..5de9782aa6 100644
--- a/src/gromacs/fft/CMakeLists.txt
+++ b/src/gromacs/fft/CMakeLists.txt
@@ -34,10 +34,10 @@
 
 # GLOB is used to get full paths
 file(GLOB FFT_SOURCES
-     fft.c fft5d.cpp parallel_3dfft.c)
+     fft.cpp fft5d.cpp parallel_3dfft.cpp)
 
 if (GMX_FFT_FFTPACK)
-    file(GLOB FFT_SPECIFIC_SOURCES fft_fftpack.c)
+    file(GLOB FFT_SPECIFIC_SOURCES fft_fftpack.cpp)
     list(APPEND FFT_SPECIFIC_SOURCES
          ${CMAKE_SOURCE_DIR}/src/external/fftpack/fftpack.c)
 endif()
@@ -45,7 +45,7 @@ if (GMX_FFT_FFTW3)
     file(GLOB FFT_SPECIFIC_SOURCES fft_fftw3.cpp)
 endif()
 if (GMX_FFT_MKL)
-    file(GLOB FFT_SPECIFIC_SOURCES fft_mkl.c)
+    file(GLOB FFT_SPECIFIC_SOURCES fft_mkl.cpp)
 endif()
 
 set(LIBGROMACS_SOURCES
diff --git a/src/gromacs/fft/fft.c b/src/gromacs/fft/fft.cpp
similarity index 100%
rename from src/gromacs/fft/fft.c
rename to src/gromacs/fft/fft.cpp
diff --git a/src/gromacs/fft/fft_fftpack.c b/src/gromacs/fft/fft_fftpack.cpp
similarity index 100%
rename from src/gromacs/fft/fft_fftpack.c
rename to src/gromacs/fft/fft_fftpack.cpp
diff --git a/src/gromacs/fft/fft_mkl.c b/src/gromacs/fft/fft_mkl.cpp
similarity index 100%
rename from src/gromacs/fft/fft_mkl.c
rename to src/gromacs/fft/fft_mkl.cpp
diff --git a/src/gromacs/fft/parallel_3dfft.c b/src/gromacs/fft/parallel_3dfft.cpp
similarity index 99%
rename from src/gromacs/fft/parallel_3dfft.c
rename to src/gromacs/fft/parallel_3dfft.cpp
index ff69a13bc8..f721bab65f 100644
--- a/src/gromacs/fft/parallel_3dfft.c
+++ b/src/gromacs/fft/parallel_3dfft.cpp
@@ -131,7 +131,7 @@ gmx_parallel_3dfft_real_limits(gmx_parallel_3dfft_t      pfft_setup,
 
 static void reorder_ivec_yzx(ivec v)
 {
-    real tmp;
+    int tmp;
 
     tmp   = v[0];
     v[XX] = v[2];