Merge pull request #135 from shehzan10/redef_fixes

Timmy · Timmy · commit 8dd05f7e4fcb · 2015-08-24T15:01:12.000-05:00
Fix redefinition warnings when using with clFFT
diff --git a/src/library/blas/generic/binary_lookup.cc b/src/library/blas/generic/binary_lookup.cc
@@ -54,7 +54,7 @@ extern "C"
 
 #include <string.h>
 
-char * sep()
+static char * sep()
 {
 #ifdef __WIN32
     return (char*)"\\";
@@ -195,7 +195,7 @@ enum BinaryRepresentation
     UNKNOWN
 };
 
-enum BinaryRepresentation getStorageMode(char * data)
+static enum BinaryRepresentation getStorageMode(char * data)
 {
     if (data[0] == 'C' && 
         data[1] == 'L' && 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ extern "C"`
`54`	`54`
`55`	`55`	`#include <string.h>`
`56`	`56`
`57`		`-char * sep()`
	`57`	`+static char * sep()`
`58`	`58`	`{`
`59`	`59`	`#ifdef __WIN32`
`60`	`60`	`return (char*)"\\";`
`@@ -195,7 +195,7 @@ enum BinaryRepresentation`
`195`	`195`	`UNKNOWN`
`196`	`196`	`};`
`197`	`197`
`198`		`-enum BinaryRepresentation getStorageMode(char * data)`
	`198`	`+static enum BinaryRepresentation getStorageMode(char * data)`
`199`	`199`	`{`
`200`	`200`	`if (data[0] == 'C' &&`
`201`	`201`	`data[1] == 'L' &&`