commit 9f7ce3d27f5ad369db54047d3f6029add70a55b9
author Josh Gao <jmgao@google.com> Mon Aug 15 13:44:37 2016 -0700
committer Josh Gao <jmgao@google.com> Mon Aug 15 14:09:53 2016 -0700
tree 723dc1b3374bc2c3c27c3a6d9faabada945ed6d1
parent 1b4b3d7a3cf5d81d84f3e27d0bdee744cc6ad05e

versioner: fix off-by-one error in header guard calculation.

This was causing redundant guards to be emitted in cases where
declarations were already guarded by another macro.

Bug: http://b/30170081
Change-Id: I9080838fbea5a56225df4b26d0918657fb6c4f21
Test: python run_tests.py

tools/versioner/src/Preprocessor.cpp

diff --git a/tools/versioner/src/Preprocessor.cpp b/tools/versioner/src/Preprocessor.cpp
index 3c18922..8d0b943 100644
--- a/tools/versioner/src/Preprocessor.cpp
+++ b/tools/versioner/src/Preprocessor.cpp
@@ -93,12 +93,12 @@
   }
 
   DeclarationAvailability result = decl_av;
-  if (result.global_availability.introduced < global_min_api_visible) {
+  if (result.global_availability.introduced <= global_min_api_visible) {
     result.global_availability.introduced = 0;
   }
 
   for (Arch arch : supported_archs) {
-    if (result.arch_availability[arch].introduced < arch_visibility[arch]) {
+    if (result.arch_availability[arch].introduced <= arch_visibility[arch]) {
       result.arch_availability[arch].introduced = 0;
     }
   }