Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 294ce05e: Merge "Make string literal concatenation play nice with C++11."

Browse Source 
* commit '294ce05e23a96353c8ddf934428bc60d1395b9a5':
  Make string literal concatenation play nice with C++11.
This commit is contained in:
Dan Albert
2014-09-09 04:06:56 +00:00
committed by Android Git Automerger
parent 2008cff73b 294ce05e23
commit 00fe3544f6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/hwui/DisplayListOp.h
View File

@@ -878,7 +878,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) const {
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));
}
@@ -1068,7 +1068,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) const {
OP_LOG("Draw patch "RECT_STRING, RECT_ARGS(mLocalBounds));
OP_LOG("Draw patch " RECT_STRING, RECT_ARGS(mLocalBounds));
}
virtual const char* name() { return "DrawPatch"; }
@@ -1150,7 +1150,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) const {
OP_LOG("Draw Rect "RECT_STRING, RECT_ARGS(mLocalBounds));
OP_LOG("Draw Rect " RECT_STRING, RECT_ARGS(mLocalBounds));
}
virtual void onDefer(OpenGLRenderer& renderer, DeferInfo& deferInfo,
@@ -1201,7 +1201,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) const {
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"; }
@@ -1244,7 +1244,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) const {
OP_LOG("Draw Oval "RECT_STRING, RECT_ARGS(mLocalBounds));
OP_LOG("Draw Oval " RECT_STRING, RECT_ARGS(mLocalBounds));
}
virtual const char* name() { return "DrawOval"; }
@@ -1264,7 +1264,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) const {
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);
}
@@ -1301,7 +1301,7 @@ public:
}
virtual void output(int level, uint32_t logFlags) const {
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"; }