summaryrefslogtreecommitdiff
path: root/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2016-11-16 11:33:57 -0800
committerStephen Hines <srhines@google.com>2016-11-17 14:16:56 -0800
commit462de21ac2e1773b99aedee012adb374e476ae36 (patch)
treed8f003a52b397143c456a1f1f297e18a615824c5 /cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
parent6babd9ca03e1379380af0c1cfde6f6d3e92ccd29 (diff)
downloadrs-462de21ac2e1773b99aedee012adb374e476ae36.tar.gz
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
Diffstat (limited to 'cpu_ref/rsCpuIntrinsicConvolve5x5.cpp')
-rw-r--r--cpu_ref/rsCpuIntrinsicConvolve5x5.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp b/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
index 92e739fe..7ea9cf85 100644
--- a/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
+++ b/cpu_ref/rsCpuIntrinsicConvolve5x5.cpp
@@ -18,9 +18,6 @@
#include "rsCpuIntrinsic.h"
#include "rsCpuIntrinsicInlines.h"
-using namespace android;
-using namespace android::renderscript;
-
namespace android {
namespace renderscript {
@@ -64,9 +61,6 @@ protected:
};
-}
-}
-
void RsdCpuScriptIntrinsicConvolve5x5::setGlobalObj(uint32_t slot, ObjectBase *data) {
rsAssert(slot == 1);
alloc.set(static_cast<Allocation *>(data));
@@ -699,9 +693,11 @@ void RsdCpuScriptIntrinsicConvolve5x5::invokeFreeChildren() {
alloc.clear();
}
-
RsdCpuScriptImpl * rsdIntrinsic_Convolve5x5(RsdCpuReferenceImpl *ctx,
const Script *s, const Element *e) {
return new RsdCpuScriptIntrinsicConvolve5x5(ctx, s, e);
}
+
+} // namespace renderscript
+} // namespace android