Merge branch 'nextRelease' of ssh://git.code.sf.net/p/foam-extend/foam-extend-4.0 into nextRelease

ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0

@@ -7,7 +7,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co
 
  # $Id: config.gnu.to.star,v 1.4 2006/06/05 21:12:16 geoffp Exp $
 
-@@ -34,6 +34,14 @@
+@@ -34,6 +34,15 @@
      x86_64-unknown-linux-gnu-null)     echo linux64_2.4-x86-glibc_2.2.5     ;;
      ppc64-unknown-linux-gnu-null)      echo linux64_2.6-pwr4-glibc_2.3.3    ;;
      i386-apple-darwin8-null)           echo i386-apple-darwin8              ;;
@@ -19,6 +19,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co
 +    i386-apple-darwin15-null)          echo i386-apple-darwin15             ;;
 +    i386-apple-darwin16-null)          echo i386-apple-darwin16             ;;
 +    i386-apple-darwin17-null)          echo i386-apple-darwin17             ;;
++    i386-apple-darwin18-null)          echo i386-apple-darwin18             ;;
      *)                                 echo unknown                         ;;
  esac
 
@@ -40,7 +41,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config.
 
  # $Id: config.system,v 1.2 2005/09/29 22:19:19 geoffp Exp $
 
-@@ -87,6 +87,33 @@
+@@ -87,6 +87,36 @@
      i386-apple-darwin8.11.1)
  	echo i386-apple-darwin8 ;;
 
@@ -70,6 +71,9 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config.
 +
 +    i386-apple-darwin17.* )
 +       echo i386-apple-darwin17 ;;
++
++    i386-apple-darwin18.* )
++       echo i386-apple-darwin18 ;;
 +
      *)
          echo unknown

ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec

@@ -106,7 +106,7 @@ fi
     [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
     [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
 
-    make -j $WM_NCOMPPROCS CC=$CC
+    make -j $WM_NCOMPPROCS CC="$WM_CC"
 
 %install
     # Manual installation

ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec

@@ -107,6 +107,7 @@ Patch0:                 libccmio-2.6.1.patch_0
     [ ! -d config/i386-apple-darwin15 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin15
     [ ! -d config/i386-apple-darwin16 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin16
     [ ! -d config/i386-apple-darwin17 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin17
+    [ ! -d config/i386-apple-darwin18 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin18
 %endif
     # Warning:
     #  1: The name of the ADF library will be renamed to libadf_ccmio since this

ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec

@@ -109,10 +109,10 @@ fi
 %ifos darwin
     make config
     # The parameter -D_POSIX_C_SOURCE=200809 has a side effect on Mac OS X
-    make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC" CC=$CC
+    make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC" CC="$CC"
 %else
     make config
-    make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809" CC=$CC
+    make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809" CC="$CC"
 %endif
 
 %install

applications/solvers/incompressible/RichardsFoam/Make/files

@@ -1,3 +1,3 @@
 RichardsFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/RichardsFoam
+EXE = $(FOAM_APPBIN)/RichardsFoam

applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/Make/files

@@ -1,3 +1,3 @@
 spatialMeanValueRichardsonFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/spatialMeanValueRichardsonFoam
+EXE = $(FOAM_APPBIN)/spatialMeanValueRichardsonFoam

applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions

@@ -2,10 +2,14 @@
 
     TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUX64 -DUSEENUM -DTHREED -U_WIN32 -DENGINE
 
-#elif defined(darwinIntel) || defined(darwinIntel64) || defined(darwinPpc) || defined(darwinPpc64)
+#elif defined(darwinIntel) || defined(darwinPpc)
 
     TECIO_FLAGS = -DMAKEARCHIVE -DDARWIN -DUSEENUM -DTHREED -U_WIN32 -DENGINE
 
+#elif defined(darwinIntel64) || defined(darwinPpc64)
+
+    TECIO_FLAGS = -DMAKEARCHIVE -DDARWIN -DUSEENUM -DTHREED -U_WIN32 -DENGINE -DMAC64
+
 #elif defined(linuxIA64)
 
     TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUXI64 -DUSEENUM -DTHREED -U_WIN32 -DENGINE

etc/getVariables.py

@@ -229,7 +229,7 @@ class BashConvert(ShellConvert):
             val=":".join(v)
         else:
             val=v
-        if val.find(" "):
+        if " " in val:
             return 'export %s="%s"' % (n,val)
         else:
             return 'export %s=%s' % (n,val)

src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C

@@ -1019,18 +1019,11 @@ void Foam::solutionControl::reconstructTransientVelocity
     const volScalarField& p
 ) const
 {
-    // If the mesh is moving, flux needs to be relative before boundary
-    // conditions for velocity are corrected. VV and IG, 4/Jan/2016.
-    fvc::makeRelative(phi, U);
-
     // Reconstruct the velocity using all the components from original equation
     U = 1.0/(1.0/rAU + ddtUEqn.A())*
         (
             U/rAU + ddtUEqn.H() - fvc::grad(p)
         );
-    
-    // Correct boundary conditions with relative flux
-    U.correctBoundaryConditions();
 
     // Get name and the corresponding index
     const word& UName = U.name();
@@ -1074,6 +1067,13 @@ void Foam::solutionControl::reconstructTransientVelocity
     // Now that the normal component is zero, add the normal component from
     // conservative flux
     faceU += phi*rSf;
+
+    // If the mesh is moving, flux needs to be relative before boundary
+    // conditions for velocity are corrected. VV and IG, 4/Jan/2016.
+    fvc::makeRelative(phi, U);
+
+    // Correct boundary conditions with relative flux
+    U.correctBoundaryConditions();
 }
 
 

src/foam/containers/Lists/List/List.C

@@ -50,15 +50,12 @@ Foam::List<T>::List(const label s)
 {
     if (this->size_ < 0)
     {
-        FatalErrorIn("List<T>::List(const label size)")
+        FatalErrorInFunction
             << "bad size " << this->size_
             << abort(FatalError);
     }
 
-    if (this->size_)
+    alloc();
-    {
-        this->v_ = new T[this->size_];
-    }
 }
 
 
@@ -70,15 +67,15 @@ Foam::List<T>::List(const label s, const T& a)
 {
     if (this->size_ < 0)
     {
-        FatalErrorIn("List<T>::List(const label size, const T&)")
+        FatalErrorInFunction
             << "bad size " << this->size_
             << abort(FatalError);
     }
 
+    alloc();
+
     if (this->size_)
     {
-        this->v_ = new T[this->size_];
-
         List_ACCESS(T, (*this), vp);
         List_FOR_ALL((*this), i)
             List_ELEM((*this), vp, i) = a;
@@ -95,15 +92,15 @@ Foam::List<T>::List(const List<T>& a)
 {
     if (this->size_)
     {
-        this->v_ = new T[this->size_];
+        alloc();
 
-#       ifdef USEMEMCPY
+        #ifdef USEMEMCPY
         if (contiguous<T>())
         {
             memcpy(this->v_, a.v_, this->byteSize());
         }
         else
-#       endif
+        #endif
         {
             List_ACCESS(T, (*this), vp);
             List_CONST_ACCESS(T, a, ap);
@@ -125,11 +122,11 @@ Foam::List<T>::List(const Xfer< List<T> >& lst)
 
 // Construct as copy or re-use as specified.
 template<class T>
-Foam::List<T>::List(List<T>& a, bool reUse)
+Foam::List<T>::List(List<T>& a, bool reuse)
 :
     UList<T>(nullptr, a.size_)
 {
-    if (reUse)
+    if (reuse)
     {
         this->v_ = a.v_;
         a.v_ = 0;
@@ -137,15 +134,15 @@ Foam::List<T>::List(List<T>& a, bool reUse)
     }
     else if (this->size_)
     {
-        this->v_ = new T[this->size_];
+        alloc();
 
-#       ifdef USEMEMCPY
+        #ifdef USEMEMCPY
         if (contiguous<T>())
         {
             memcpy(this->v_, a.v_, this->byteSize());
         }
         else
-#       endif
+        #endif
         {
             List_ACCESS(T, (*this), vp);
             List_CONST_ACCESS(T, a, ap);
@@ -167,11 +164,11 @@ Foam::List<T>::List(const UList<T>& a, const unallocLabelList& map)
     {
         // Note:cannot use List_ELEM since third argument has to be index.
 
-        this->v_ = new T[this->size_];
+        alloc();
 
         forAll(*this, i)
         {
-            this->v_[i] = a[map[i]];
+            this->operator[](i) = a[map[i]];
         }
     }
 }
@@ -181,32 +178,9 @@ Foam::List<T>::List(const UList<T>& a, const unallocLabelList& map)
 template<class T>
 template<class InputIterator>
 Foam::List<T>::List(InputIterator first, InputIterator last)
-{
+:
-    label s = 0;
+    List<T>(first, last, std::distance(first, last))
-    for
+{}
-    (
-        InputIterator iter = first;
-        iter != last;
-        ++iter
-    )
-    {
-        s++;
-    }
-
-    setSize(s);
-
-    s = 0;
-
-    for
-    (
-        InputIterator iter = first;
-        iter != last;
-        ++iter
-    )
-    {
-        this->operator[](s++) = iter();
-    }
-}
 
 
 // Construct as copy of FixedList<T, Size>
@@ -216,15 +190,7 @@ Foam::List<T>::List(const FixedList<T, Size>& lst)
 :
     UList<T>(nullptr, Size)
 {
-    if (this->size_)
+    allocCopyList(lst);
-    {
-        this->v_ = new T[this->size_];
-
-        forAll(*this, i)
-        {
-            this->operator[](i) = lst[i];
-        }
-    }
 }
 
 
@@ -234,15 +200,7 @@ Foam::List<T>::List(const PtrList<T>& lst)
 :
     UList<T>(nullptr, lst.size())
 {
-    if (this->size_)
+    allocCopyList(lst);
-    {
-        this->v_ = new T[this->size_];
-
-        forAll(*this, i)
-        {
-            this->operator[](i) = lst[i];
-        }
-    }
 }
 
 
@@ -254,7 +212,7 @@ Foam::List<T>::List(const SLList<T>& lst)
 {
     if (this->size_)
     {
-        this->v_ = new T[this->size_];
+        alloc();
 
         label i = 0;
         for
@@ -276,15 +234,7 @@ Foam::List<T>::List(const IndirectList<T>& lst)
 :
     UList<T>(nullptr, lst.size())
 {
-    if (this->size_)
+    allocCopyList(lst);
-    {
-        this->v_ = new T[this->size_];
-
-        forAll(*this, i)
-        {
-            this->operator[](i) = lst[i];
-        }
-    }
 }
 
 
@@ -294,15 +244,7 @@ Foam::List<T>::List(const UIndirectList<T>& lst)
 :
     UList<T>(nullptr, lst.size())
 {
-    if (this->size_)
+    allocCopyList(lst);
-    {
-        this->v_ = new T[this->size_];
-
-        forAll(*this, i)
-        {
-            this->operator[](i) = lst[i];
-        }
-    }
 }
 
 
@@ -312,15 +254,7 @@ Foam::List<T>::List(const BiIndirectList<T>& lst)
 :
     UList<T>(nullptr, lst.size())
 {
-    if (this->size_)
+    allocCopyList(lst);
-    {
-        this->v_ = new T[this->size_];
-
-        forAll(*this, i)
-        {
-            this->operator[](i) = lst[i];
-        }
-    }
 }
 
 
@@ -330,7 +264,10 @@ Foam::List<T>::List(const BiIndirectList<T>& lst)
 template<class T>
 Foam::List<T>::~List()
 {
-    if (this->v_) delete[] this->v_;
+    if (this->v_)
+    {
+        delete[] this->v_;
+    }
 }
 
 
@@ -341,7 +278,7 @@ void Foam::List<T>::setSize(const label newSize)
 {
     if (newSize < 0)
     {
-        FatalErrorIn("List<T>::setSize(const label)")
+        FatalErrorInFunction
             << "bad set size " << newSize
             << abort(FatalError);
     }
@@ -369,8 +306,8 @@ void Foam::List<T>::setSize(const label newSize)
                     while (i--) *--av = *--vv;
                 }
             }
-            if (this->v_) delete[] this->v_;
 
+            clear();
             this->size_ = newSize;
             this->v_ = nv;
         }
@@ -397,21 +334,12 @@ void Foam::List<T>::setSize(const label newSize, const T& a)
 }
 
 
-template<class T>
-void Foam::List<T>::clear()
-{
-    if (this->v_) delete[] this->v_;
-    this->size_ = 0;
-    this->v_ = 0;
-}
-
-
 // Transfer the contents of the argument List into this List
 // and anull the argument list
 template<class T>
 void Foam::List<T>::transfer(List<T>& a)
 {
-    if (this->v_) delete[] this->v_;
+    clear();
     this->size_ = a.size_;
     this->v_ = a.v_;
 
@@ -450,13 +378,7 @@ void Foam::List<T>::transfer(SortableList<T>& a)
 template<class T>
 void Foam::List<T>::operator=(const UList<T>& a)
 {
-    if (a.size_ != this->size_)
+    reAlloc(a.size_);
-    {
-        if (this->v_) delete[] this->v_;
-        this->v_ = 0;
-        this->size_ = a.size_;
-        if (this->size_) this->v_ = new T[this->size_];
-    }
 
     if (this->size_)
     {
@@ -484,7 +406,7 @@ void Foam::List<T>::operator=(const List<T>& a)
 {
     if (this == &a)
     {
-        FatalErrorIn("List<T>::operator=(const List<T>&)")
+        FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
@@ -497,13 +419,7 @@ void Foam::List<T>::operator=(const List<T>& a)
 template<class T>
 void Foam::List<T>::operator=(const SLList<T>& lst)
 {
-    if (lst.size() != this->size_)
+    reAlloc(lst.size());
-    {
-        if (this->v_) delete[] this->v_;
-        this->v_ = 0;
-        this->size_ = lst.size();
-        if (this->size_) this->v_ = new T[this->size_];
-    }
 
     if (this->size_)
     {
@@ -525,18 +441,8 @@ void Foam::List<T>::operator=(const SLList<T>& lst)
 template<class T>
 void Foam::List<T>::operator=(const IndirectList<T>& lst)
 {
-    if (lst.size() != this->size_)
+    reAlloc(lst.size());
-    {
+    copyList(lst);
-        if (this->v_) delete[] this->v_;
-        this->v_ = 0;
-        this->size_ = lst.size();
-        if (this->size_) this->v_ = new T[this->size_];
-    }
-
-    forAll(*this, i)
-    {
-        this->operator[](i) = lst[i];
-    }
 }
 
 
@@ -544,18 +450,8 @@ void Foam::List<T>::operator=(const IndirectList<T>& lst)
 template<class T>
 void Foam::List<T>::operator=(const UIndirectList<T>& lst)
 {
-    if (lst.size() != this->size_)
+    reAlloc(lst.size());
-    {
+    copyList(lst);
-        if (this->v_) delete[] this->v_;
-        this->v_ = 0;
-        this->size_ = lst.size();
-        if (this->size_) this->v_ = new T[this->size_];
-    }
-
-    forAll(*this, i)
-    {
-        this->operator[](i) = lst[i];
-    }
 }
 
 
@@ -563,18 +459,8 @@ void Foam::List<T>::operator=(const UIndirectList<T>& lst)
 template<class T>
 void Foam::List<T>::operator=(const BiIndirectList<T>& lst)
 {
-    if (lst.size() != this->size_)
+    reAlloc(lst.size());
-    {
+    copyList(lst);
-        if (this->v_) delete[] this->v_;
-        this->v_ = 0;
-        this->size_ = lst.size();
-        if (this->size_) this->v_ = new T[this->size_];
-    }
-
-    forAll(*this, i)
-    {
-        this->operator[](i) = lst[i];
-    }
 }
 
 // * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //

src/foam/containers/Lists/List/List.H

@@ -80,6 +80,27 @@ class List
     public UList<T>
 {
 
+    // Private member functions
+
+        //- Allocate list storage
+        inline void alloc();
+
+        //- Reallocate list storage to the given size
+        inline void reAlloc(const label s);
+
+        //- Copy list of given type
+        template<class List2>
+        inline void copyList(const List2&);
+
+        //- Allocate storage and copy list of given type
+        template<class List2>
+        inline void allocCopyList(const List2&);
+
+        //- Construct given start and end iterators and number of elements
+        template<class InputIterator>
+        inline List(InputIterator first, InputIterator last, const label s);
+
+
 protected:
 
     //- Override size to be inconsistent with allocated storage.
@@ -118,7 +139,7 @@ public:
         List(const Xfer< List<T> >&);
 
         //- Construct as copy or re-use as specified.
-        List(List<T>&, bool reUse);
+        List(List<T>&, bool reuse);
 
         //- Construct as subset.
         List(const UList<T>&, const unallocLabelList& mapAddressing);
@@ -184,8 +205,8 @@ public:
             //- Reset size of List and value for new elements.
             void setSize(const label, const T&);
 
-            //- Clear the list, i.e. set size to zero.
+            //- Clear the list, i.e. set size to zero
-            void clear();
+            inline void clear();
 
             //- Append an element at the end of the list
             inline void append(const T&);

src/foam/containers/Lists/List/ListI.H

@@ -23,6 +23,80 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class T>
+inline void Foam::List<T>::alloc()
+{
+    if (this->size_ > 0)
+    {
+        this->v_ = new T[this->size_];
+    }
+}
+
+
+template<class T>
+inline void Foam::List<T>::reAlloc(const label s)
+{
+    if (this->size_ != s)
+    {
+        clear();
+        this->size_ = s;
+        alloc();
+    }
+}
+
+
+template<class T>
+template<class List2>
+inline void Foam::List<T>::copyList(const List2& lst)
+{
+    if (this->size_)
+    {
+        forAll(*this, i)
+        {
+            this->operator[](i) = lst[i];
+        }
+    }
+}
+
+
+template<class T>
+template<class List2>
+inline void Foam::List<T>::allocCopyList(const List2& lst)
+{
+    if (this->size_)
+    {
+        alloc();
+        copyList(lst);
+    }
+}
+
+
+template<class T>
+template<class InputIterator>
+inline Foam::List<T>::List
+(
+    InputIterator first,
+    InputIterator last,
+    const label s
+)
+:
+    UList<T>(nullptr, s)
+{
+    if (this->size_)
+    {
+        alloc();
+
+        InputIterator iter = first;
+        forAll(*this, i)
+        {
+            this->operator[](i) = *iter++;
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
@@ -46,6 +120,19 @@ inline const Foam::List<T>& Foam::List<T>::null()
 }
 
 
+template<class T>
+inline void Foam::List<T>::clear()
+{
+    if (this->v_)
+    {
+        delete[] this->v_;
+        this->v_ = 0;
+    }
+
+    this->size_ = 0;
+}
+
+
 template<class T>
 inline void Foam::List<T>::resize(const label newSize)
 {

src/foam/fields/PointPatchFieldTemplates/constraint/processor/ProcessorPointPatchField.C

@@ -170,7 +170,7 @@ receivePointField
             outstandingSendRequest_ = -1;
             outstandingRecvRequest_ = -1;
 
-            memcpy(tf().begin(), receiveBuf_.begin(), tf().byteSize());
+            memcpy(static_cast<void*>(tf().begin()), receiveBuf_.begin(), tf().byteSize());
         }
         else
         {

src/foam/matrices/lduMatrix/lduAddressing/lduInterfaces/processorLduInterface/processorLduInterfaceTemplates.C

@@ -107,7 +107,7 @@ void Foam::processorLduInterface::receive
     }
     else if (commsType == Pstream::nonBlocking)
     {
-        memcpy(f.begin(), receiveBuf_.begin(), f.byteSize());
+        memcpy(static_cast<void*>(f.begin()), receiveBuf_.begin(), f.byteSize());
     }
     else
     {

testHarness/foam-extend/4.1/scripts/AdditionalRunFunctions

@@ -36,10 +36,10 @@ verbose_report_on_runApplication_error()
    if [ "$reportOnErrorOnlyOnce" ] ; then
        echo " "
        echo " => Error running $APP_RUN..."
-       echo " => Here are the last 50 lines of the log file log.$APP_RUN..."
+       echo " => Here are the last 50 lines of the log file $LOG_NAME..."
        echo " "
-       if [ -f log.$APP_RUN ] ; then
+       if [ -f $LOG_NAME ] ; then
-           tail -50 log.$APP_RUN
+           tail -50 $LOG_NAME
            exit $ecode;
        fi
    fi

wmake/rules/General/flex++

@@ -2,8 +2,8 @@
 
 # For older versions of flex, the option --c++ is not avaliable
 # Switching to flex++ is an alternative
-#Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
+#Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) $(c++LESSWARN) -c $*.C -o $@
-Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
+Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) $(c++LESSWARN) -c $*.C -o $@
 
 .L.dep:
 	$(MAKE_DEP)

wmake/rules/SiCortex64Gcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -mabi=64
 #CC          = scg++ -mabi=64
 

wmake/rules/SunOS64Gcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linux64Gcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -std=c++11 -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linux64Icc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -wd327,584,654,819,1125,1476,1505,1572
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -diag-disable 1224,2026,2305
+
 CC          = icpc -DIntel
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxARM7Gcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -std=c++11
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxARM8Arm/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wno-undefined-var-template -Wno-deprecated-register -Wno-overloaded-virtual -Wno-null-dereference
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = armclang++ -std=c++11 -DARM_CLANG
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxARM8Gcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -std=c++11
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxGcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -std=c++11 -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxIA64Gcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -std=c++11
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxIA64I64/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -wd654,819,1125,1476,1505,1572
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -diag-disable 1224,2026,2305
+
 CC          = icpc -DIntel
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxIA64Icc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -wd327,654,819,1125,1476,1505,1572
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -diag-disable 1224,2026,2305
+
 CC          = icpc
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxIcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -wd654 -wd1125 -vec-report0
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -diag-disable 1224,2026,2305
+
 CC          = icpc -DIntel
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/linuxPPC64Gcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -std=c++11 -m64 -mcpu=power5+
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/mingwGcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
+
 CC          = g++ -std=c++11
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)

wmake/rules/solarisGcc/c++

@@ -2,6 +2,9 @@
 
 c++WARN     = -Wall -Wextra -Wno-unused-parameter
 
+# Suppress some warnings for flex++ and CGAL
+c++LESSWARN =
+
 CC          = g++ -std=c++11
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)