summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2013-07-30 01:00:11 +0200
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2013-07-30 01:00:11 +0200
commit9af9028b681a55135adf1c9f4454f7b8456dd551 (patch)
tree07deeb67ffb35f83eb644fc310875ea208667e0f
parentf4002771b56066d7a82ef9928df07d386ec23e1d (diff)
downloadbase-9af9028b681a55135adf1c9f4454f7b8456dd551.tar.gz
hwui: Fix build in ISO C++11 mode
Make sure log calls can't be confused with C++11 string literals Change-Id: I1d458e92e690f6f2b922a05494db8c01da54e460 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--libs/hwui/DisplayListOp.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h
index a0290e37012f..7642c4984c89 100644
--- a/libs/hwui/DisplayListOp.h
+++ b/libs/hwui/DisplayListOp.h
@@ -832,7 +832,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) {
- OP_LOG("Draw bitmap %p src="RECT_STRING", dst="RECT_STRING,
+ OP_LOG("Draw bitmap %p src=" RECT_STRING ", dst=" RECT_STRING,
mBitmap, RECT_ARGS(mSrc), RECT_ARGS(mLocalBounds));
}
@@ -922,7 +922,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) {
- OP_LOG("Draw patch "RECT_STRING, RECT_ARGS(mLocalBounds));
+ OP_LOG("Draw patch " RECT_STRING, RECT_ARGS(mLocalBounds));
}
virtual const char* name() { return "DrawPatch"; }
@@ -1001,7 +1001,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) {
- OP_LOG("Draw Rect "RECT_STRING, RECT_ARGS(mLocalBounds));
+ OP_LOG("Draw Rect " RECT_STRING, RECT_ARGS(mLocalBounds));
}
virtual const char* name() { return "DrawRect"; }
@@ -1045,7 +1045,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) {
- OP_LOG("Draw RoundRect "RECT_STRING", rx %f, ry %f", RECT_ARGS(mLocalBounds), mRx, mRy);
+ OP_LOG("Draw RoundRect " RECT_STRING ", rx %f, ry %f", RECT_ARGS(mLocalBounds), mRx, mRy);
}
virtual const char* name() { return "DrawRoundRect"; }
@@ -1088,7 +1088,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) {
- OP_LOG("Draw Oval "RECT_STRING, RECT_ARGS(mLocalBounds));
+ OP_LOG("Draw Oval " RECT_STRING, RECT_ARGS(mLocalBounds));
}
virtual const char* name() { return "DrawOval"; }
@@ -1108,7 +1108,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) {
- OP_LOG("Draw Arc "RECT_STRING", start %f, sweep %f, useCenter %d",
+ OP_LOG("Draw Arc " RECT_STRING ", start %f, sweep %f, useCenter %d",
RECT_ARGS(mLocalBounds), mStartAngle, mSweepAngle, mUseCenter);
}
@@ -1145,7 +1145,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) {
- OP_LOG("Draw Path %p in "RECT_STRING, mPath, RECT_ARGS(mLocalBounds));
+ OP_LOG("Draw Path %p in " RECT_STRING, mPath, RECT_ARGS(mLocalBounds));
}
virtual const char* name() { return "DrawPath"; }