X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Fast%2Fincludes%2Ftypes%2Farrayof.hxx;h=726880dc10b20371334d1d1d7704bac3ebf4fc91;hp=7ffe6b873960bc70fd20efe5c12dfe72c652d5fa;hb=025bb6738d47ccbd9093b90bc22b9710c41227c0;hpb=0068b70ee75ebbfd7f0201abec7a5e56df5469b0

diff --git a/scilab/modules/ast/includes/types/arrayof.hxx b/scilab/modules/ast/includes/types/arrayof.hxx
index 7ffe6b8..726880d 100644
--- a/scilab/modules/ast/includes/types/arrayof.hxx
+++ b/scilab/modules/ast/includes/types/arrayof.hxx
@@ -177,16 +177,16 @@ protected :
     virtual void            deleteImg() = 0;
 public :
 
-    bool isArrayOf()
+    bool isArrayOf() override
     {
         return true;
     }
 
-    bool isTrue();
+    bool isTrue() override;
 
     // The function is not write here because we needs to create a Bool which inherits from ArrayOf<int>
     // so it will create a cyclic dependency... so the body of the function is in bool.hxx after the Bool definition.
-    virtual bool neg(InternalType *& out);
+    virtual bool neg(InternalType *& out) override;
 
     virtual bool isVector() //only one dim must be != 1
     {
@@ -209,7 +209,7 @@ public :
         return true;
     }
 
-    virtual bool isComplex()
+    virtual bool isComplex() override
     {
         return m_pImgData != NULL;
     }
@@ -455,31 +455,31 @@ public :
         return getImg(getIndex(piIndexes));
     }
 
-    virtual ArrayOf<T>* insert(typed_list* _pArgs, InternalType* _pSource);
+    virtual ArrayOf<T>* insert(typed_list* _pArgs, InternalType* _pSource) override;
     virtual ArrayOf<T>* append(int _iRows, int _iCols, InternalType* _poSource);
-    virtual ArrayOf<T>* resize(int* _piDims, int _iDims);
+    virtual ArrayOf<T>* resize(int* _piDims, int _iDims) override;
 
     // return a GenericType because of [] wich is a types::Double (can't be a ArrayOf<char>)
-    virtual GenericType* remove(typed_list* _pArgs);
-    virtual GenericType* extract(typed_list* _pArgs);
-    virtual GenericType* insertNew(typed_list* _pArgs);
+    virtual GenericType* remove(typed_list* _pArgs) override;
+    virtual GenericType* extract(typed_list* _pArgs) override;
+    virtual GenericType* insertNew(typed_list* _pArgs) override;
 
     virtual bool invoke(typed_list & in, optional_list & /*opt*/, int /*_iRetCount*/, typed_list & out, const ast::Exp & e) override;
-    virtual bool isInvokable() const;
-    virtual bool hasInvokeOption() const;
-    virtual int getInvokeNbIn();
-    virtual int getInvokeNbOut();
+    virtual bool isInvokable() const override;
+    virtual bool hasInvokeOption() const override;
+    virtual int getInvokeNbIn() override;
+    virtual int getInvokeNbOut() override;
 
-    virtual ArrayOf<T>* reshape(int _iNewRows, int _iNewCols)
+    virtual ArrayOf<T>* reshape(int _iNewRows, int _iNewCols) override
     {
         int piDims[2] = {_iNewRows, _iNewCols};
         return reshape(piDims, 2);
     }
 
-    virtual ArrayOf<T>* reshape(int* _piDims, int _iDims);
+    virtual ArrayOf<T>* reshape(int* _piDims, int _iDims) override;
 
 
-    virtual ArrayOf<T>* resize(int _iNewRows, int _iNewCols)
+    virtual ArrayOf<T>* resize(int _iNewRows, int _iNewCols) override
     {
         int piDims[2] = {_iNewRows, _iNewCols};
         return resize(piDims, 2);
@@ -504,11 +504,11 @@ public :
 
     void getIndexes(int _iIndex, int* _piIndexes);
 
-    virtual bool getMemory(long long* _piSize, long long* _piSizePlusType);
+    virtual bool getMemory(long long* _piSize, long long* _piSizePlusType) override;
 
     void humanReadableByteCount(size_t n, char (&str)[9]);
 
-    ArrayOf<T>* getColumnValues(int _iPos)
+    ArrayOf<T>* getColumnValues(int _iPos) override
     {
         ArrayOf<T>* pOut = NULL;
         if (_iPos < m_iCols)
@@ -533,7 +533,7 @@ public :
         return pOut;
     }
 
-    virtual bool toString(std::wostringstream& ostr)
+    virtual bool toString(std::wostringstream& ostr) override
     {
         int* piDims = new int[m_iDims];
         bool bFinish = parseSubMatrix(ostr, piDims, m_iDims, m_iDims - 1);
@@ -598,7 +598,7 @@ public :
 
     virtual bool subMatrixToString(std::wostringstream& ostr, int* _piDims, int _iDims) = 0;
 
-    virtual std::wstring toStringInLine()
+    virtual std::wstring toStringInLine() override
     {
         std::wostringstream ostr;
         ostr << L"[";