Fixed unused parameter warnings in release builds.

eskroch · eskroch · commit 427d5535d78b · 2020-01-05T21:17:49.000-05:00
diff --git a/framework/Source/CPTDefinitions.h b/framework/Source/CPTDefinitions.h
@@ -42,6 +42,20 @@
 
 #define cpt_deprecated __attribute__((deprecated))
 
+// Unused parameter attribute (DEBUG only)
+
+/**
+ *  @def cpt_unused
+ *  @hideinitializer
+ *  @brief Marks a parameter value as unused only in RELEASE builds.
+ **/
+
+#ifdef DEBUG
+#define cpt_unused
+#else
+#define cpt_unused __unused
+#endif
+
 // Swift wrappers
 
 /**
diff --git a/framework/Source/CPTPlotSpace.m b/framework/Source/CPTPlotSpace.m
@@ -505,7 +505,7 @@ -(NSUInteger)numberOfCoordinates
  *  @param plotPoint An array of data point coordinates (as NSNumber values).
  *  @return The drawing coordinates of the data point.
  **/
--(CGPoint)plotAreaViewPointForPlotPoint:(nonnull CPTNumberArray *)plotPoint
+-(CGPoint)plotAreaViewPointForPlotPoint:(nonnull CPTNumberArray *cpt_unused)plotPoint
 {
     NSParameterAssert(plotPoint.count == self.numberOfCoordinates);
 
@@ -517,7 +517,7 @@ -(CGPoint)plotAreaViewPointForPlotPoint:(nonnull CPTNumberArray *)plotPoint
  *  @param count The number of coordinate values in the @par{plotPoint} array.
  *  @return The drawing coordinates of the data point.
  **/
--(CGPoint)plotAreaViewPointForPlotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger)count
+-(CGPoint)plotAreaViewPointForPlotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count
 {
     NSParameterAssert(count == self.numberOfCoordinates);
 
@@ -529,7 +529,7 @@ -(CGPoint)plotAreaViewPointForPlotPoint:(nonnull NSDecimal *__unused)plotPoint n
  *  @param count The number of coordinate values in the @par{plotPoint} array.
  *  @return The drawing coordinates of the data point.
  **/
--(CGPoint)plotAreaViewPointForDoublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger)count
+-(CGPoint)plotAreaViewPointForDoublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count
 {
     NSParameterAssert(count == self.numberOfCoordinates);
 
@@ -550,7 +550,7 @@ -(nullable CPTNumberArray *)plotPointForPlotAreaViewPoint:(CGPoint __unused)poin
  *  @param count The number of coordinate values in the @par{plotPoint} array.
  *  @param point The drawing coordinates of the data point.
  **/
--(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger)count forPlotAreaViewPoint:(CGPoint __unused)point
+-(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count forPlotAreaViewPoint:(CGPoint __unused)point
 {
     NSParameterAssert(count == self.numberOfCoordinates);
 }
@@ -560,7 +560,7 @@ -(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSU
  *  @param count The number of coordinate values in the @par{plotPoint} array.
  *  @param point The drawing coordinates of the data point.
  **/
--(void)doublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger)count forPlotAreaViewPoint:(CGPoint __unused)point
+-(void)doublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count forPlotAreaViewPoint:(CGPoint __unused)point
 {
     NSParameterAssert(count == self.numberOfCoordinates);
 }
@@ -588,7 +588,7 @@ -(nullable CPTNumberArray *)plotPointForEvent:(nonnull CPTNativeEvent *__unused)
  *  @param count The number of coordinate values in the @par{plotPoint} array.
  *  @param event The event.
  **/
--(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger)count forEvent:(nonnull CPTNativeEvent *__unused)event
+-(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count forEvent:(nonnull CPTNativeEvent *__unused)event
 {
     NSParameterAssert(count == self.numberOfCoordinates);
 }
@@ -598,7 +598,7 @@ -(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSU
  *  @param count The number of coordinate values in the @par{plotPoint} array.
  *  @param event The event.
  **/
--(void)doublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger)count forEvent:(nonnull CPTNativeEvent *__unused)event
+-(void)doublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count forEvent:(nonnull CPTNativeEvent *__unused)event
 {
     NSParameterAssert(count == self.numberOfCoordinates);
 }

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ -(NSUInteger)numberOfCoordinates`
`505`	`505`	`* @param plotPoint An array of data point coordinates (as NSNumber values).`
`506`	`506`	`* @return The drawing coordinates of the data point.`
`507`	`507`	`**/`
`508`		`--(CGPoint)plotAreaViewPointForPlotPoint:(nonnull CPTNumberArray *)plotPoint`
	`508`	`+-(CGPoint)plotAreaViewPointForPlotPoint:(nonnull CPTNumberArray *cpt_unused)plotPoint`
`509`	`509`	`{`
`510`	`510`	`NSParameterAssert(plotPoint.count == self.numberOfCoordinates);`
`511`	`511`
`@@ -517,7 +517,7 @@ -(CGPoint)plotAreaViewPointForPlotPoint:(nonnull CPTNumberArray *)plotPoint`
`517`	`517`	`* @param count The number of coordinate values in the @par{plotPoint} array.`
`518`	`518`	`* @return The drawing coordinates of the data point.`
`519`	`519`	`**/`
`520`		`--(CGPoint)plotAreaViewPointForPlotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger)count`
	`520`	`+-(CGPoint)plotAreaViewPointForPlotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count`
`521`	`521`	`{`
`522`	`522`	`NSParameterAssert(count == self.numberOfCoordinates);`
`523`	`523`
`@@ -529,7 +529,7 @@ -(CGPoint)plotAreaViewPointForPlotPoint:(nonnull NSDecimal *__unused)plotPoint n`
`529`	`529`	`* @param count The number of coordinate values in the @par{plotPoint} array.`
`530`	`530`	`* @return The drawing coordinates of the data point.`
`531`	`531`	`**/`
`532`		`--(CGPoint)plotAreaViewPointForDoublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger)count`
	`532`	`+-(CGPoint)plotAreaViewPointForDoublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count`
`533`	`533`	`{`
`534`	`534`	`NSParameterAssert(count == self.numberOfCoordinates);`
`535`	`535`
`@@ -550,7 +550,7 @@ -(nullable CPTNumberArray *)plotPointForPlotAreaViewPoint:(CGPoint __unused)poin`
`550`	`550`	`* @param count The number of coordinate values in the @par{plotPoint} array.`
`551`	`551`	`* @param point The drawing coordinates of the data point.`
`552`	`552`	`**/`
`553`		`--(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger)count forPlotAreaViewPoint:(CGPoint __unused)point`
	`553`	`+-(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count forPlotAreaViewPoint:(CGPoint __unused)point`
`554`	`554`	`{`
`555`	`555`	`NSParameterAssert(count == self.numberOfCoordinates);`
`556`	`556`	`}`
`@@ -560,7 +560,7 @@ -(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSU`
`560`	`560`	`* @param count The number of coordinate values in the @par{plotPoint} array.`
`561`	`561`	`* @param point The drawing coordinates of the data point.`
`562`	`562`	`**/`
`563`		`--(void)doublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger)count forPlotAreaViewPoint:(CGPoint __unused)point`
	`563`	`+-(void)doublePrecisionPlotPoint:(nonnull double *__unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count forPlotAreaViewPoint:(CGPoint __unused)point`
`564`	`564`	`{`
`565`	`565`	`NSParameterAssert(count == self.numberOfCoordinates);`
`566`	`566`	`}`
`@@ -588,7 +588,7 @@ -(nullable CPTNumberArray )plotPointForEvent:(nonnull CPTNativeEvent __unused)`
`588`	`588`	`* @param count The number of coordinate values in the @par{plotPoint} array.`
`589`	`589`	`* @param event The event.`
`590`	`590`	`**/`
`591`		`--(void)plotPoint:(nonnull NSDecimal __unused)plotPoint numberOfCoordinates:(NSUInteger)count forEvent:(nonnull CPTNativeEvent __unused)event`
	`591`	`+-(void)plotPoint:(nonnull NSDecimal __unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count forEvent:(nonnull CPTNativeEvent __unused)event`
`592`	`592`	`{`
`593`	`593`	`NSParameterAssert(count == self.numberOfCoordinates);`
`594`	`594`	`}`
`@@ -598,7 +598,7 @@ -(void)plotPoint:(nonnull NSDecimal *__unused)plotPoint numberOfCoordinates:(NSU`
`598`	`598`	`* @param count The number of coordinate values in the @par{plotPoint} array.`
`599`	`599`	`* @param event The event.`
`600`	`600`	`**/`
`601`		`--(void)doublePrecisionPlotPoint:(nonnull double __unused)plotPoint numberOfCoordinates:(NSUInteger)count forEvent:(nonnull CPTNativeEvent __unused)event`
	`601`	`+-(void)doublePrecisionPlotPoint:(nonnull double __unused)plotPoint numberOfCoordinates:(NSUInteger cpt_unused)count forEvent:(nonnull CPTNativeEvent __unused)event`
`602`	`602`	`{`
`603`	`603`	`NSParameterAssert(count == self.numberOfCoordinates);`
`604`	`604`	`}`