[clfft] 50/128: fix compile errors on linux

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clfft.

commit b8587a44d16589c0591240995eb7454641b4daa5
Author: pradeeptrgit <pradeep.rao at amd.com>
Date:   Tue Sep 1 14:39:26 2015 +0530

    fix compile errors on linux
---
 src/client-callback/callback-client.cpp | 10 +++++-----
 src/tests/accuracy_test_precallback.cpp |  6 +++---
 src/tests/cl_transform.h                |  2 +-
 src/tests/fftw_transform.h              |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/client-callback/callback-client.cpp b/src/client-callback/callback-client.cpp
index 3c4e67f..c3d424b 100644
--- a/src/client-callback/callback-client.cpp
+++ b/src/client-callback/callback-client.cpp
@@ -1164,7 +1164,7 @@ int transform( size_t* lengths, const size_t *inStrides, const size_t *outStride
 		//C2C 1D Interleaved 
 		if (in_layout == CLFFT_COMPLEX_INTERLEAVED )
 		{
-			char* precallbackstr = (precision == CLFFT_SINGLE) ? STRINGIFY(MULVAL) : STRINGIFY(MULVAL_DP);
+			const char* precallbackstr = (precision == CLFFT_SINGLE) ? STRINGIFY(MULVAL) : STRINGIFY(MULVAL_DP);
 
 			int *h_userdata = (int*)malloc(sizeof(int)*fftBatchSize);
 			for( cl_uint i = 0; i < fftBatchSize; i = i + inStrides[0])
@@ -1178,7 +1178,7 @@ int transform( size_t* lengths, const size_t *inStrides, const size_t *outStride
 		}
 		else if (in_layout == CLFFT_HERMITIAN_INTERLEAVED)
 		{	
-			char* precallbackstr = (precision == CLFFT_SINGLE) ? STRINGIFY(MULVAL_C2R) : STRINGIFY(MULVAL_DP);
+			const char* precallbackstr = (precision == CLFFT_SINGLE) ? STRINGIFY(MULVAL_C2R) : STRINGIFY(MULVAL_DP);
 			
 			int *h_userdata = (int*)malloc(sizeof(int)*fftBatchSize);
 			for(size_t b = 0; b < batch_size; b++)
@@ -1198,7 +1198,7 @@ int transform( size_t* lengths, const size_t *inStrides, const size_t *outStride
 		else if (in_layout == CLFFT_COMPLEX_PLANAR)
 		{	
 			//C2C PLANAR 
-			char* precallbackstr = (precision == CLFFT_SINGLE) ? STRINGIFY(MULVAL_PLANAR) : STRINGIFY(MULVAL_PLANAR_DP);
+			const char* precallbackstr = (precision == CLFFT_SINGLE) ? STRINGIFY(MULVAL_PLANAR) : STRINGIFY(MULVAL_PLANAR_DP);
 			USER_DATA *h_userdata = (USER_DATA*)malloc(sizeof(USER_DATA) * fftBatchSize);
 			for( size_t i = 0; i < fftBatchSize; i = i + inStrides[0])
 			{
@@ -1213,7 +1213,7 @@ int transform( size_t* lengths, const size_t *inStrides, const size_t *outStride
 		else if (in_layout == CLFFT_HERMITIAN_PLANAR)
 		{	
 			//C2C PLANAR 
-			char* precallbackstr = (precision == CLFFT_SINGLE) ? STRINGIFY(MULVAL_PLANAR) : STRINGIFY(MULVAL_PLANAR_DP);
+			const char* precallbackstr = (precision == CLFFT_SINGLE) ? STRINGIFY(MULVAL_PLANAR) : STRINGIFY(MULVAL_PLANAR_DP);
 			USER_DATA *h_userdata = (USER_DATA*)malloc(sizeof(USER_DATA) * fftBatchSize);
 			for(size_t b = 0; b < batch_size; b++)
 			{
@@ -1521,4 +1521,4 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/src/tests/accuracy_test_precallback.cpp b/src/tests/accuracy_test_precallback.cpp
index 09efeb7..2305870 100644
--- a/src/tests/accuracy_test_precallback.cpp
+++ b/src/tests/accuracy_test_precallback.cpp
@@ -92,12 +92,12 @@ public:
 			sumi *= 5;
 		}
 	}
-} supported_sizes;
+} supported_sizes_precallback;
 
 INSTANTIATE_TEST_CASE_P(
 	mixed_radices_precallback,
 	mixed_radix_precallback,
-	::testing::ValuesIn( supported_sizes.sizes )
+	::testing::ValuesIn( supported_sizes_precallback.sizes )
 );
 
 namespace precallback
@@ -1679,4 +1679,4 @@ TEST_F(accuracy_test_precallback_single, lds_1D_forward_64_in_place_complex_inte
 	catch( const std::exception& err ) { handle_exception(err);	}
 }
 
-}
\ No newline at end of file
+}
diff --git a/src/tests/cl_transform.h b/src/tests/cl_transform.h
index cc946eb..9c6d2b2 100644
--- a/src/tests/cl_transform.h
+++ b/src/tests/cl_transform.h
@@ -623,7 +623,7 @@ public:
 		clfftPrecision precision;
 		clfftGetPlanPrecision( *plan_handle, &precision );
 
-		char* precallbackstr;
+		const char* precallbackstr;
 		
 		if (localMemSize > 0)
 		{
diff --git a/src/tests/fftw_transform.h b/src/tests/fftw_transform.h
index cd44d9a..5eaebbf 100644
--- a/src/tests/fftw_transform.h
+++ b/src/tests/fftw_transform.h
@@ -449,7 +449,7 @@ public:
 					input.batch_size(),
 					input.distance(),
 					layout::real ,
-					cl_placeness(placeness::in_place)
+					CLFFT_INPLACE
 					);
 		
 		userdata.set_all_to_random_data(_lengths[0], 10);
@@ -466,7 +466,7 @@ public:
 					input.batch_size(),
 					input.distance(),
 					layout::real ,
-					cl_placeness(placeness::in_place)
+					CLFFT_INPLACE
 					);
 		
 		userdata.set_all_to_random_data(_lengths[0], 10);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git