commit bc10dff26207bb8c02051b28326bb134a8f28eb3
author Miao Wang <miaowang@google.com> Fri Apr 03 17:44:55 2015 -0700
committer Miao Wang <miaowang@google.com> Mon Apr 13 17:11:08 2015 -0700
tree 166685cd4ef0a8eb4bb9e15c9e76284b1c607481
parent 893754fc6016d6c144788ec94a7db55d1061ef18

remove STL from rs C++ public interface. Nuke stlport.

Change-Id: Ida273c1cfa21c4db51ae41a4c42746d9d828f292

cpp/rsCppStructs.h

diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index 7fb1f35..f3f7f31 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -20,8 +20,6 @@
 #include "rsDefines.h"
 #include "util/RefBase.h"
 
-#include <vector>
-#include <string>
 #include <pthread.h>
 
 
@@ -101,7 +99,7 @@
      * @param[in] flags Optional flags for this context.
      * @return true on success
      */
-    bool init(std::string name, uint32_t flags = 0);
+    bool init(const char * name, uint32_t flags = 0);
 
     /**
      * Sets the error handler function for this context. This error handler is
@@ -155,7 +153,7 @@
     static bool usingNative;
     static bool initDispatch(int targetApi);
 
-    bool init(std::string &name, int targetApi, uint32_t flags);
+    bool init(const char * name, int targetApi, uint32_t flags);
     static void * threadProc(void *);
 
     static bool gInitialized;
@@ -173,7 +171,8 @@
     MessageHandlerFunc_t mMessageFunc;
     bool mInit;
 
-    std::string mCacheDir;
+    char mCacheDir[PATH_MAX+1];
+    uint32_t mCacheDirLen;
 
     struct {
         sp<const Element> U8;
@@ -272,7 +271,7 @@
 protected:
     void *mID;
     RS* mRS;
-    std::string mName;
+    const char * mName;
 
     BaseObj(void *id, sp<RS> rs);
     void checkValid();
@@ -660,7 +659,7 @@
      * @return number of sub-elements
      */
     size_t getSubElementCount() {
-        return mVisibleElementMap.size();
+        return mVisibleElementMapSize;
     }
 
     /**
@@ -1104,23 +1103,28 @@
     class Builder {
     private:
         RS* mRS;
-        std::vector<sp<Element> > mElements;
-        std::vector<std::string> mElementNames;
-        std::vector<uint32_t> mArraySizes;
+        size_t mElementsCount;
+        size_t mElementsVecSize;
+        sp<const Element> * mElements;
+        char ** mElementNames;
+        size_t * mElementNameLengths;
+        uint32_t * mArraySizes;
         bool mSkipPadding;
 
     public:
         Builder(sp<RS> rs);
         ~Builder();
-        void add(sp<Element> e, std::string &name, uint32_t arraySize = 1);
+        void add(sp<const Element> e, const char * name, uint32_t arraySize = 1);
         sp<const Element> create();
     };
 
 protected:
     Element(void *id, sp<RS> rs,
-            std::vector<sp<Element> > &elements,
-            std::vector<std::string> &elementNames,
-            std::vector<uint32_t> &arraySizes);
+            sp<const Element> * elements,
+            size_t elementCount,
+            const char ** elementNames,
+            size_t * elementNameLengths,
+            uint32_t * arraySizes);
     Element(void *id, sp<RS> rs, RsDataType dt, RsDataKind dk, bool norm, uint32_t size);
     Element(sp<RS> rs);
     virtual ~Element();
@@ -1128,11 +1132,15 @@
 private:
     void updateVisibleSubElements();
 
-    std::vector<sp<Element> > mElements;
-    std::vector<std::string> mElementNames;
-    std::vector<uint32_t> mArraySizes;
-    std::vector<uint32_t> mVisibleElementMap;
-    std::vector<uint32_t> mOffsetInBytes;
+    size_t mElementsCount;
+    size_t mVisibleElementMapSize;
+
+    sp<const Element> * mElements;
+    char ** mElementNames;
+    size_t * mElementNameLengths;
+    uint32_t * mArraySizes;
+    uint32_t * mVisibleElementMap;
+    uint32_t * mOffsetInBytes;
 
     RsDataType mType;
     RsDataKind mKind;