commit 1dd2b87327a347ab8b0197ef297d67ece4a08abd
author Allan MacKinnon <allanmac@google.com> Thu Aug 23 13:14:41 2018 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Aug 23 20:36:38 2018 +0000
tree 4e3494684ca9e699495cc9f1dfb16264813037a9
parent 4dddad2bf8b5a53354d6134e596e6635d64c15a0

Fix HotSort benchmark and typo

Bug: skia:
Change-Id: I1805a1e08e87a898f6d00ab86daa3fac1d3d5916
Reviewed-on: https://skia-review.googlesource.com/149031
Reviewed-by: Allan MacKinnon <allanmac@google.com>
Commit-Queue: Allan MacKinnon <allanmac@google.com>
Auto-Submit: Allan MacKinnon <allanmac@google.com>

src/compute/common/macros.h

diff --git a/src/compute/common/macros.h b/src/compute/common/macros.h
index 9528568..d65c126 100644
--- a/src/compute/common/macros.h
+++ b/src/compute/common/macros.h
@@ -64,8 +64,8 @@
 //
 //
 
-#define EVAL_MACRO(x)           x
-#define CONCAT_MACRO(a,b)       EVAL_MACRO(a)##EVAL_MACRO(b)
+#define CONCAT_MACRO_2(a,b)     a ## b
+#define CONCAT_MACRO(a,b)       CONCAT_MACRO_2(a,b)
 
 //
 // Convert byte pointer to a network order 32-bit integer to host