Fix windows compile errors. (#19344) (#19345)

vtkIdType cverts[nbnel] yields 'does not evaluate to constant' error. In order for this to work 'nbnel' must be a constant at compile time, so need to use 'new' to allocate the array. strcasestr not defined on Windows, #define it to be 'StrStrIA'.
visit-dav · Feb 23, 2024 · b287642 · b287642
1 parent d73c6a7
commit b287642
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/databases/unv/avtunvFileFormat.C b/src/databases/unv/avtunvFileFormat.C
@@ -61,6 +61,11 @@
 #include <avtParallel.h>
 #endif
 
+#ifdef _MSC_VER
+#include <shlwapi.h>
+#define strcasestr StrStrIA
+#endif
+
 using     std::string;
 using namespace std;
 
@@ -2678,7 +2683,7 @@ avtunvFileFormat::GetMesh(const char *meshname)
             case 34:
             {
                 int nbnel = itre->nbnel ;
-                vtkIdType cverts[nbnel];
+                vtkIdType *cverts = new vtkIdType[nbnel];
                 for (int i=0; i < nbnel; i++)
                 {
                     anUnvNode.label = itre->nodes[i];
@@ -2689,6 +2694,7 @@ avtunvFileFormat::GetMesh(const char *meshname)
 #endif
                 }
                 ugrid->InsertNextCell(VTK_POLYGON, nbnel, cverts);
+                delete [] cverts;
                 break;
             }
             case 24:
@@ -2866,7 +2872,7 @@ avtunvFileFormat::GetMesh(const char *meshname)
                 case 34:
                 {
                     int nbnel = itre->nbnel ;
-                    vtkIdType cverts[nbnel];
+                    vtkIdType *cverts = new vtkIdType[nbnel];
                     for (int i=0; i < nbnel; i++)
                     {
                         anUnvNode.label = itre->nodes[i];
@@ -2877,6 +2883,7 @@ avtunvFileFormat::GetMesh(const char *meshname)
 #endif
                     }
                     ugrid->InsertNextCell(VTK_POLYGON, nbnel, cverts);
+                    delete [] cverts;
                     break;
                 }
                 default:
@@ -2940,7 +2947,7 @@ avtunvFileFormat::GetMesh(const char *meshname)
                 case 34:
                 {
                     int nbnel = itre->nbnel ;
-                    vtkIdType cverts[nbnel];
+                    vtkIdType *cverts = new vtkIdType[nbnel];
                     for (int i=0; i < nbnel; i++)
                     {
                         anUnvNode.label = itre->nodes[i];
@@ -2951,6 +2958,7 @@ avtunvFileFormat::GetMesh(const char *meshname)
 #endif
                     }
                     ugrid->InsertNextCell(VTK_POLYGON, nbnel, cverts);
+                    delete [] cverts;
                     break;
                 }
                 default: