From: Alexandr Arutjunov Date: Sat, 13 Aug 2016 13:09:21 +0000 (+0300) Subject: [*] Few C++11 constructions are removed. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1844665693139e941935e4ba2ce2ff54786a170e;p=platform%2Fupstream%2Fassimp.git [*] Few C++11 constructions are removed. --- diff --git a/code/glTFAsset.h b/code/glTFAsset.h index 90335f5..3adfb12 100644 --- a/code/glTFAsset.h +++ b/code/glTFAsset.h @@ -54,6 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include +#include #define RAPIDJSON_HAS_STDSTRING 1 #include @@ -733,7 +734,7 @@ namespace glTF /// \struct SCompression_Open3DGC /// Compression of mesh data using Open3DGC algorythm. - struct SCompression_Open3DGC final : public SExtension + struct SCompression_Open3DGC : public SExtension { using SExtension::Type; diff --git a/code/glTFAsset.inl b/code/glTFAsset.inl index 3397171..59ee79e 100644 --- a/code/glTFAsset.inl +++ b/code/glTFAsset.inl @@ -343,7 +343,7 @@ inline void Buffer::EncodedRegion_Mark(const size_t pOffset, const size_t pEncod // Check offset if(pOffset > byteLength) { - constexpr uint8_t val_size = 32; + const uint8_t val_size = 32; char val[val_size]; @@ -354,7 +354,7 @@ inline void Buffer::EncodedRegion_Mark(const size_t pOffset, const size_t pEncod // Check length if((pOffset + pEncodedData_Length) > byteLength) { - constexpr uint8_t val_size = 64; + const uint8_t val_size = 64; char val[val_size];