diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-03-13 17:13:45 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-03-13 17:13:45 -0500 |
| commit | 9a7a19c77ad1b143c7acfa915af7887e417253f1 (patch) | |
| tree | f1fa5386449233e69b022c508d6a508eb73e38ae /indra/llmath/llvolume.h | |
| parent | 08ae21f52dbbe6245ac8deee0fdfd5df4d3dba53 (diff) | |
| parent | bba84a3fa9a1af87f6a8080f9093f9277feb1292 (diff) | |
Merge
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index 5e43af92ec..6b599a4126 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -57,6 +57,7 @@ class LLVolumeTriangle; #include "llrefcount.h" #include "llpointer.h" #include "llfile.h" +#include "llalignedarray.h" //============================================================================ @@ -195,26 +196,6 @@ const U8 LL_SCULPT_FLAG_MIRROR = 128; const S32 LL_SCULPT_MESH_MAX_FACES = 8; -template <class T, U32 alignment> -class LLAlignedArray -{ -public: - T* mArray; - U32 mElementCount; - U32 mCapacity; - - LLAlignedArray(); - ~LLAlignedArray(); - - void push_back(const T& elem); - U32 size() const { return mElementCount; } - void resize(U32 size); - T* append(S32 N); - T& operator[](int idx); - const T& operator[](int idx) const; -}; - - class LLProfileParams { public: |