Updated copyright comment

[modules/hexablock.git] / src / HEXABLOCK / HexCrossElements.hxx

diff --git a/src/HEXABLOCK/HexCrossElements.hxx b/src/HEXABLOCK/HexCrossElements.hxx
old mode 100755 (executable)
new mode 100644 (file)
index 46c8525..6596a6b
--- a/src/HEXABLOCK/HexCrossElements.hxx
+++ b/src/HEXABLOCK/HexCrossElements.hxx
@@ -1,12 +1,12 @@
 
 // Class : Gestion des tutaux en T (like castles in scotland)
 
-// Copyright (C) 2009-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,6 +22,7 @@
 #ifndef __CROSS_ELEMENTS_H
 #define __CROSS_ELEMENTS_H
 
+#include "Hex_defines.hxx"
 #include "HexElements.hxx"
 
 BEGIN_NAMESPACE_HEXA
@@ -33,18 +34,10 @@ enum { MiddleSlice1=NbrSlices1/2};
 enum { Cyl1=CylSmall, Cyl2=CylBig };
 enum { NO_CYL=-1, NO_PIPE=0, IS_HERE=1 };
 
-class CrossElements : public Elements
+class HEXABLOCKENGINE_EXPORT CrossElements : public Elements
 {
 public:
-   virtual int countHexa   () { return nbr_hexas ; }
-   virtual int countQuad   () { return nbr_quads ; }
-   virtual int countEdge   () { return nbr_edges ; }
-   virtual int countVertex () { return nbr_vertex ; }
-
-public:
-   CrossElements (Document* doc, EnumGrid type=GR_BICYL);
-
-   virtual ~CrossElements () {}
+   CrossElements (Document* doc, EnumGrid type);
 
    Hexa*   getHexaIJK   (int part, int nx, int ny, int nz);
    Quad*   getQuadIJ    (int part, int nx, int ny, int nz);
@@ -55,12 +48,20 @@ public:
    Edge*   getEdgeK     (int part, int nx, int ny, int nz);
    Vertex* getVertexIJK (int part, int nx, int ny, int nz);
 
+#ifndef SWIG
+public :
+   virtual ~CrossElements () {}
                      // Tutaux en T (like castles in scotland)
    int  crossCylinders (Cylinder* cyl1, Cylinder* cyl2, bool fill=true);
    void dump ();
    void dumpVertex ();
    void dumpHexas  ();
 
+   virtual int countHexa   () { return nbr_hexas ; }
+   virtual int countQuad   () { return nbr_quads ; }
+   virtual int countEdge   () { return nbr_edges ; }
+   virtual int countVertex () { return nbr_vertex ; }
+
 private :
 
    void resize ();
@@ -134,6 +135,7 @@ private :
     bool  at_right,  at_left;
     int   cyl_right, cyl_left;
     NewShape* grid_geom;
+#endif   // SWIG
 };
 END_NAMESPACE_HEXA
 #endif