summaryrefslogtreecommitdiff
path: root/rsScriptGroup.cpp
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2016-11-15 15:14:05 -0800
committerChih-Hung Hsieh <chh@google.com>2016-11-16 10:29:25 -0800
commit11496ac131bb691edf5bdcab3029dceef5c1e4e1 (patch)
tree9961794b45fa6f66d3ba89754ee60372f0719d86 /rsScriptGroup.cpp
parent6babd9ca03e1379380af0c1cfde6f6d3e92ccd29 (diff)
downloadrs-11496ac131bb691edf5bdcab3029dceef5c1e4e1.tar.gz
Fix google-build-using-namespace warnings in rs.
* Most files define classes in renderscript namespace. Define them in the namespace instead of "using namespace ...". Some files define global C++ names, and we replace "using namespace ..." with using declarations of the required names. * Add "NOLINT" comment to rsg_generator.c output code to suppress such warnings. Bug: 32670901 Test: build with WITH_TIDY=1 Change-Id: I9b0edcad3e1fb37c79927b05fd58fb1a301bdf22
Diffstat (limited to 'rsScriptGroup.cpp')
-rw-r--r--rsScriptGroup.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/rsScriptGroup.cpp b/rsScriptGroup.cpp
index 2dde7275..4a961142 100644
--- a/rsScriptGroup.cpp
+++ b/rsScriptGroup.cpp
@@ -23,8 +23,8 @@
#include <algorithm>
#include <time.h>
-using namespace android;
-using namespace android::renderscript;
+namespace android {
+namespace renderscript {
ScriptGroup::ScriptGroup(Context *rsc) : ScriptGroupBase(rsc) {
}
@@ -380,9 +380,6 @@ ScriptGroup::Link::Link() {
ScriptGroup::Link::~Link() {
}
-namespace android {
-namespace renderscript {
-
RsScriptGroup rsi_ScriptGroupCreate(Context *rsc,
RsScriptKernelID * kernels, size_t kernelsSize,
@@ -420,5 +417,5 @@ void rsi_ScriptGroupExecute(Context *rsc, RsScriptGroup sg) {
s->execute(rsc);
}
-}
-}
+} // namespace renderscript
+} // namespace android