do not play preprocessor tricks with 'private', use public interfaces instead; this appeases the VC++ buildbots

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167724 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 7 deletions

diff --git a/unittests/VMCore/WaymarkTest.cpp b/unittests/VMCore/WaymarkTest.cpp
index 41228c90f9..9005b0c988 100644
--- a/unittests/VMCore/WaymarkTest.cpp
+++ b/unittests/VMCore/WaymarkTest.cpp
@@ -9,9 +9,6 @@
 
 // we perform white-box tests
 //
-#define private public
-#include "llvm/Use.h"
-#undef private
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/LLVMContext.h"
@@ -24,7 +21,7 @@ namespace {
 Constant *char2constant(char c) {
   return ConstantInt::get(Type::getInt8Ty(getGlobalContext()), c);
 }
-  
+
 
 TEST(WaymarkTest, NativeArray) {
   static uint8_t tail[22] = "s02s33s30y2y0s1x0syxS";
@@ -39,17 +36,17 @@ TEST(WaymarkTest, NativeArray) {
 	const Use *Ue = &A->getOperandUse(22);
   for (; U != Ue; ++U)
   {
-    EXPECT_EQ(Ue + 1, U->getImpliedUser());
+    EXPECT_EQ(A, U->getUser());
   }
 }
 
 TEST(WaymarkTest, TwoBit) {
-  Use* many = (Use*)calloc(sizeof(Use), 8212);
+  Use* many = (Use*)calloc(sizeof(Use), 8212 + 1);
   ASSERT_TRUE(many);
 	Use::initTags(many, many + 8212);
   for (const Use *U = many, *Ue = many + 8212 - 1; U != Ue; ++U)
   {
-    EXPECT_EQ(Ue + 1, U->getImpliedUser());
+    EXPECT_EQ((User*)(Ue + 1), U->getUser());
   }
 }