Fix google-build-using-namespace warnings in cpu_ref.
* Remove "using namespace ..." statements.
* Replace them with using declarations of the required names.
* Enclose the C++ methods and static and extern "C" functions with
namespace android and renderscript.
* Keep global C++ functions as-is and add using declarations for them.
Bug: 32670901
Test: build with WITH_TIDY=1
Change-Id: I818de466e8786a6c4f9ce0cd8e0fe027f34d7fad
diff --git a/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp b/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
index 46802fc..c2b4bd9 100644
--- a/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
+++ b/cpu_ref/rsCpuIntrinsicConvolve3x3.cpp
@@ -18,9 +18,6 @@
#include "rsCpuIntrinsic.h"
#include "rsCpuIntrinsicInlines.h"
-using namespace android;
-using namespace android::renderscript;
-
namespace android {
namespace renderscript {
@@ -62,10 +59,6 @@
uint32_t outstep);
};
-}
-}
-
-
void RsdCpuScriptIntrinsicConvolve3x3::setGlobalObj(uint32_t slot, ObjectBase *data) {
rsAssert(slot == 1);
mAlloc.set(static_cast<Allocation *>(data));
@@ -502,8 +495,10 @@
mAlloc.clear();
}
-
RsdCpuScriptImpl * rsdIntrinsic_Convolve3x3(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e) {
return new RsdCpuScriptIntrinsicConvolve3x3(ctx, s, e);
}
+
+} // namespace renderscript
+} // namespace android
