summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2012-11-16 14:02:18 -0800
committerTim Murray <timmurray@google.com>2012-11-16 14:12:24 -0800
commit9eb7f4b90120ebe4be74343856e86b46495f72df (patch)
tree3df192a7abfd3f480d9b27081b2c22ffee4e3096
parent843fdc303f9cafff2b77fa927c183d64e59fa1d8 (diff)
downloadrs-9eb7f4b90120ebe4be74343856e86b46495f72df.tar.gz
Change namespace from renderscriptCpp to RSC
Change-Id: I6c40a91d3afad8411d0ad49088a8e52c251b7038
-rw-r--r--cpp/Allocation.cpp2
-rw-r--r--cpp/BaseObj.cpp2
-rw-r--r--cpp/Element.cpp2
-rw-r--r--cpp/RenderScript.cpp2
-rw-r--r--cpp/Script.cpp2
-rw-r--r--cpp/ScriptC.cpp2
-rw-r--r--cpp/ScriptIntrinsics.cpp2
-rw-r--r--cpp/Type.cpp2
-rw-r--r--cpp/rsCppStructs.h2
-rw-r--r--tests/cppallocation/compute.cpp2
-rw-r--r--tests/cppbasic/compute.cpp2
-rw-r--r--tests/latency/latency.cpp2
12 files changed, 12 insertions, 12 deletions
diff --git a/cpp/Allocation.cpp b/cpp/Allocation.cpp
index 5dd6af65..121d88d1 100644
--- a/cpp/Allocation.cpp
+++ b/cpp/Allocation.cpp
@@ -17,7 +17,7 @@
#include "RenderScript.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
void * Allocation::getIDSafe() const {
return getID();
diff --git a/cpp/BaseObj.cpp b/cpp/BaseObj.cpp
index 4a9faace..bb92bceb 100644
--- a/cpp/BaseObj.cpp
+++ b/cpp/BaseObj.cpp
@@ -19,7 +19,7 @@
#include "RenderScript.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
void * BaseObj::getID() const {
if (mID == NULL) {
diff --git a/cpp/Element.cpp b/cpp/Element.cpp
index 99b10690..198aac84 100644
--- a/cpp/Element.cpp
+++ b/cpp/Element.cpp
@@ -20,7 +20,7 @@
#include "RenderScript.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
sp<const Element> Element::getSubElement(uint32_t index) {
if (!mVisibleElementMap.size()) {
diff --git a/cpp/RenderScript.cpp b/cpp/RenderScript.cpp
index 4a96dce3..ffc0ce67 100644
--- a/cpp/RenderScript.cpp
+++ b/cpp/RenderScript.cpp
@@ -25,7 +25,7 @@
#include "rs.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
bool RS::gInitialized = false;
pthread_mutex_t RS::gInitMutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/cpp/Script.cpp b/cpp/Script.cpp
index 074c4630..09d541d3 100644
--- a/cpp/Script.cpp
+++ b/cpp/Script.cpp
@@ -20,7 +20,7 @@
#include "RenderScript.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
void Script::invoke(uint32_t slot, const void *v, size_t len) const {
rsScriptInvokeV(mRS->getContext(), getID(), slot, v, len);
diff --git a/cpp/ScriptC.cpp b/cpp/ScriptC.cpp
index 3a1909d7..bc7ca0e0 100644
--- a/cpp/ScriptC.cpp
+++ b/cpp/ScriptC.cpp
@@ -20,7 +20,7 @@
#include "RenderScript.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
ScriptC::ScriptC(sp<RS> rs,
const void *codeTxt, size_t codeLength,
diff --git a/cpp/ScriptIntrinsics.cpp b/cpp/ScriptIntrinsics.cpp
index 74363515..12847360 100644
--- a/cpp/ScriptIntrinsics.cpp
+++ b/cpp/ScriptIntrinsics.cpp
@@ -21,7 +21,7 @@
#include "rsDefines.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
ScriptIntrinsic::ScriptIntrinsic(sp<RS> rs, int id, sp<const Element> e)
: Script(NULL, rs) {
diff --git a/cpp/Type.cpp b/cpp/Type.cpp
index 1b64c30d..6b9ac401 100644
--- a/cpp/Type.cpp
+++ b/cpp/Type.cpp
@@ -23,7 +23,7 @@
#include "RenderScript.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
void Type::calcElementCount() {
bool hasLod = hasMipmaps();
diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index f1376b0a..3598367b 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -24,7 +24,7 @@
#include <rs.h>
namespace android {
-namespace renderscriptCpp {
+namespace RSC {
typedef void (*ErrorHandlerFunc_t)(uint32_t errorNum, const char *errorText);
typedef void (*MessageHandlerFunc_t)(uint32_t msgNum, const void *msgData, size_t msgLen);
diff --git a/tests/cppallocation/compute.cpp b/tests/cppallocation/compute.cpp
index 214ffe90..8439ffb6 100644
--- a/tests/cppallocation/compute.cpp
+++ b/tests/cppallocation/compute.cpp
@@ -4,7 +4,7 @@
#include "ScriptC_multiply.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
int main(int argc, char** argv)
{
diff --git a/tests/cppbasic/compute.cpp b/tests/cppbasic/compute.cpp
index e0151651..782410a2 100644
--- a/tests/cppbasic/compute.cpp
+++ b/tests/cppbasic/compute.cpp
@@ -4,7 +4,7 @@
#include "ScriptC_mono.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
int main(int argc, char** argv)
{
diff --git a/tests/latency/latency.cpp b/tests/latency/latency.cpp
index b6e45e1f..b6a6c47c 100644
--- a/tests/latency/latency.cpp
+++ b/tests/latency/latency.cpp
@@ -4,7 +4,7 @@
#include "ScriptC_latency.h"
using namespace android;
-using namespace renderscriptCpp;
+using namespace RSC;
int main(int argc, char** argv)
{