[Gridflow-cvs] [svn] commit: r3941 - in /trunk: base/grid.c gridflow.h optional/fftw.c

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Wed Jun 25 14:56:09 EDT 2008


Author: matju
Date: Wed Jun 25 14:56:09 2008
New Revision: 3941

Log:
rename CHECK_ALIGN to CHECK_ALIGN16 to avoid name conflict

Modified:
    trunk/base/grid.c
    trunk/gridflow.h
    trunk/optional/fftw.c

Modified: trunk/base/grid.c
==============================================================================
--- trunk/base/grid.c (original)
+++ trunk/base/grid.c Wed Jun 25 14:56:09 2008
@@ -47,7 +47,6 @@
 #define CHECK_BUSY(s) \
 	if (!dim) RAISE("%s: " #s " not busy (wanting to write %ld values)",ARGS(parent),(long)n);
 
-#undef CHECK_ALIGN
 #define CHECK_ALIGN(d) \
 	{int bytes = number_type_table[nt].size/8; \
 	int align = ((long)(void*)d)%bytes; \

Modified: trunk/gridflow.h
==============================================================================
--- trunk/gridflow.h (original)
+++ trunk/gridflow.h Wed Jun 25 14:56:09 2008
@@ -820,7 +820,7 @@
 	if (in.size()<=i) in.resize(i+1); \
 	if (!in[i]) in[i]=new GridInlet((FObject *)this,&class##_grid_##i##_hand);
 
-#define CHECK_ALIGN(d,nt) \
+#define CHECK_ALIGN16(d,nt) \
 	{int bytes = 16; \
 	int align = ((ulong)(void*)d)%bytes; \
 	if (align) {_L_;post("%s(%s): Alignment Warning: %s=%p is not %d-aligned: %d", \

Modified: trunk/optional/fftw.c
==============================================================================
--- trunk/optional/fftw.c (original)
+++ trunk/optional/fftw.c Wed Jun 25 14:56:09 2008
@@ -60,8 +60,8 @@
 } GRID_FLOW {
 	float32 *buf = (float32 *)memalign(16,n*sizeof(float32));
 	long chans = in->dim->prod(2)/2;
-	CHECK_ALIGN(data,in->nt)
-	CHECK_ALIGN(buf, in->nt)
+	CHECK_ALIGN16(data,in->nt)
+	CHECK_ALIGN16(buf, in->nt)
 	fftwf_complex *ip = (fftwf_complex *)data;
 	fftwf_complex *op = (fftwf_complex *)buf;
 	if (plan && lastdim && lastdim!=in->dim && chans!=lastchans) {fftwf_destroy_plan(plan); plan=0;}



More information about the Gridflow-cvs mailing list