From: ageay <ageay>
Date: Thu, 22 Aug 2013 15:15:03 +0000 (+0000)
Subject: Unwarningization under Win.
X-Git-Tag: B4AnonymousThrow~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b2b7e3dc76ec0eede44486b91e516c640da140d0;p=modules%2Fmed.git

Unwarningization under Win.
---

diff --git a/src/INTERP_KERNEL/DirectedBoundingBox.hxx b/src/INTERP_KERNEL/DirectedBoundingBox.hxx
index 65f3b1bd0..78d02f190 100644
--- a/src/INTERP_KERNEL/DirectedBoundingBox.hxx
+++ b/src/INTERP_KERNEL/DirectedBoundingBox.hxx
@@ -31,35 +31,35 @@ namespace INTERP_KERNEL
    * \brief Class representing the bounding box of a number of points
    *  with box axes parallel to principal axes of inertia of points
    */
-  class INTERPKERNEL_EXPORT DirectedBoundingBox
+  class DirectedBoundingBox
   {
   public:
 
-    DirectedBoundingBox();
+    INTERPKERNEL_EXPORT DirectedBoundingBox();
 
-    DirectedBoundingBox(const double* pts, const unsigned numPts, const unsigned dim);
+    INTERPKERNEL_EXPORT DirectedBoundingBox(const double* pts, const unsigned numPts, const unsigned dim);
 
-    DirectedBoundingBox(const double** pts, const unsigned numPts, const unsigned dim);
+    INTERPKERNEL_EXPORT DirectedBoundingBox(const double** pts, const unsigned numPts, const unsigned dim);
 
     //~DirectedBoundingBox();
 
-    void enlarge(const double tol);
+    INTERPKERNEL_EXPORT void enlarge(const double tol);
     
-    bool isDisjointWith(const DirectedBoundingBox& box) const;
+    INTERPKERNEL_EXPORT bool isDisjointWith(const DirectedBoundingBox& box) const;
 
-    bool isDisjointWith(const double* box) const;
+    INTERPKERNEL_EXPORT bool isDisjointWith(const double* box) const;
 
-    bool isOut(const double* point) const;
+    INTERPKERNEL_EXPORT bool isOut(const double* point) const;
 
 
     // return internal data
-    std::vector<double> getData() const;
+    INTERPKERNEL_EXPORT std::vector<double> getData() const;
 
     // initialize with data returned by getData()
-    void setData(const double* data);
+    INTERPKERNEL_EXPORT void setData(const double* data);
 
     // return size of internal data
-    static int dataSize(int dim);
+    INTERPKERNEL_EXPORT static int dataSize(int dim);
 
   private:
 
diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
index 0463ecc21..dde7ef0f5 100644
--- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
+++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DElementaryEdge.hxx
@@ -28,51 +28,51 @@
 
 namespace INTERP_KERNEL
 {
-  class INTERPKERNEL_EXPORT ElementaryEdge
+  class ElementaryEdge
   {
   public:
-    ElementaryEdge(Edge *ptr, bool direction):_direction(direction),_ptr(ptr) { }
-    ElementaryEdge(const ElementaryEdge& other);
-    ~ElementaryEdge();
-    bool isThereStartPoint() const { return _iterator.isValid(); }
-    IteratorOnComposedEdge& getIterator() { return _iterator; }
-    bool completed() const { return false; }
-    void declareOn() const { _ptr->declareOn(); }
-    void declareIn() const { _ptr->declareIn(); }
-    void declareOut() const { _ptr->declareOut(); }
-    TypeOfEdgeLocInPolygon getLoc() const { return _ptr->getLoc(); }
-    Edge *getPtr() const { return _ptr; }
-    void reverse() { _direction=(!_direction); }
-    bool isNodeIn(Node *n) const;
-    double getAreaOfZone() const { double ret=_ptr->getAreaOfZone(); return _direction?ret:-ret; }
-    void getBarycenterOfZone(double *bary) const;
-    void fillBounds(Bounds& output) const;
-    void applySimilarity(double xBary, double yBary, double dimChar) { _ptr->applySimilarity(xBary,yBary,dimChar); }
-    void unApplySimilarity(double xBary, double yBary, double dimChar) { _ptr->unApplySimilarity(xBary,yBary,dimChar); }
-    void getAllNodes(std::set<Node *>& output) const;
-    void getBarycenter(double *bary, double& weigh) const;
-    ElementaryEdge *clone() const;
-    void initLocations() const;
-    int size() const;
-    TypeOfEdgeLocInPolygon locateFullyMySelfAbsolute(const ComposedEdge& pol) const;
-    TypeOfEdgeLocInPolygon locateFullyMySelf(const ComposedEdge& pol, TypeOfEdgeLocInPolygon precEdgeLoc) const;
-    Node *getEndNode() const;
-    Node *getStartNode() const;
-    double getCurveLength() const { return _ptr->getCurveLength(); }
-    bool changeEndNodeWith(Node *node) const;
-    bool changeStartNodeWith(Node *node) const;
-    bool intresicEqual(const ElementaryEdge *other) const;
-    bool intresicEqualDirSensitive(const ElementaryEdge *other) const;
-    void dumpInXfigFile(std::ostream& stream, int resolution, const Bounds& box) const;
-    bool getDirection() const { return _direction; }
-    bool intresincEqCoarse(const Edge *other) const;
-    bool isEqual(const ElementaryEdge& other) const;
+    INTERPKERNEL_EXPORT ElementaryEdge(Edge *ptr, bool direction):_direction(direction),_ptr(ptr) { }
+    INTERPKERNEL_EXPORT ElementaryEdge(const ElementaryEdge& other);
+    INTERPKERNEL_EXPORT ~ElementaryEdge();
+    INTERPKERNEL_EXPORT bool isThereStartPoint() const { return _iterator.isValid(); }
+    INTERPKERNEL_EXPORT IteratorOnComposedEdge& getIterator() { return _iterator; }
+    INTERPKERNEL_EXPORT bool completed() const { return false; }
+    INTERPKERNEL_EXPORT void declareOn() const { _ptr->declareOn(); }
+    INTERPKERNEL_EXPORT void declareIn() const { _ptr->declareIn(); }
+    INTERPKERNEL_EXPORT void declareOut() const { _ptr->declareOut(); }
+    INTERPKERNEL_EXPORT TypeOfEdgeLocInPolygon getLoc() const { return _ptr->getLoc(); }
+    INTERPKERNEL_EXPORT Edge *getPtr() const { return _ptr; }
+    INTERPKERNEL_EXPORT void reverse() { _direction=(!_direction); }
+    INTERPKERNEL_EXPORT bool isNodeIn(Node *n) const;
+    INTERPKERNEL_EXPORT double getAreaOfZone() const { double ret=_ptr->getAreaOfZone(); return _direction?ret:-ret; }
+    INTERPKERNEL_EXPORT void getBarycenterOfZone(double *bary) const;
+    INTERPKERNEL_EXPORT void fillBounds(Bounds& output) const;
+    INTERPKERNEL_EXPORT void applySimilarity(double xBary, double yBary, double dimChar) { _ptr->applySimilarity(xBary,yBary,dimChar); }
+    INTERPKERNEL_EXPORT void unApplySimilarity(double xBary, double yBary, double dimChar) { _ptr->unApplySimilarity(xBary,yBary,dimChar); }
+    INTERPKERNEL_EXPORT void getAllNodes(std::set<Node *>& output) const;
+    INTERPKERNEL_EXPORT void getBarycenter(double *bary, double& weigh) const;
+    INTERPKERNEL_EXPORT ElementaryEdge *clone() const;
+    INTERPKERNEL_EXPORT void initLocations() const;
+    INTERPKERNEL_EXPORT int size() const;
+    INTERPKERNEL_EXPORT TypeOfEdgeLocInPolygon locateFullyMySelfAbsolute(const ComposedEdge& pol) const;
+    INTERPKERNEL_EXPORT TypeOfEdgeLocInPolygon locateFullyMySelf(const ComposedEdge& pol, TypeOfEdgeLocInPolygon precEdgeLoc) const;
+    INTERPKERNEL_EXPORT Node *getEndNode() const;
+    INTERPKERNEL_EXPORT Node *getStartNode() const;
+    INTERPKERNEL_EXPORT double getCurveLength() const { return _ptr->getCurveLength(); }
+    INTERPKERNEL_EXPORT bool changeEndNodeWith(Node *node) const;
+    INTERPKERNEL_EXPORT bool changeStartNodeWith(Node *node) const;
+    INTERPKERNEL_EXPORT bool intresicEqual(const ElementaryEdge *other) const;
+    INTERPKERNEL_EXPORT bool intresicEqualDirSensitive(const ElementaryEdge *other) const;
+    INTERPKERNEL_EXPORT void dumpInXfigFile(std::ostream& stream, int resolution, const Bounds& box) const;
+    INTERPKERNEL_EXPORT bool getDirection() const { return _direction; }
+    INTERPKERNEL_EXPORT bool intresincEqCoarse(const Edge *other) const;
+    INTERPKERNEL_EXPORT bool isEqual(const ElementaryEdge& other) const;
   public:
-    void fillGlobalInfoAbs(const std::map<INTERP_KERNEL::Node *,int>& mapThis, const std::map<INTERP_KERNEL::Node *,int>& mapOther, int offset1, int offset2, double fact, double baryX, double baryY,
-                           std::vector<int>& edgesThis, std::vector<double>& addCoo, std::map<INTERP_KERNEL::Node *,int> mapAddCoo) const;
-    void fillGlobalInfoAbs2(const std::map<INTERP_KERNEL::Node *,int>& mapThis, const std::map<INTERP_KERNEL::Node *,int>& mapOther, int offset1, int offset2, double fact, double baryX, double baryY,
-                            std::vector<int>& edgesOther, std::vector<double>& addCoo, std::map<INTERP_KERNEL::Node *,int>& mapAddCoo) const;
-    static ElementaryEdge *BuildEdgeFromCrudeDataArray(bool direction, INTERP_KERNEL::Node *start, INTERP_KERNEL::Node *end);
+    INTERPKERNEL_EXPORT void fillGlobalInfoAbs(const std::map<INTERP_KERNEL::Node *,int>& mapThis, const std::map<INTERP_KERNEL::Node *,int>& mapOther, int offset1, int offset2, double fact, double baryX, double baryY,
+                                               std::vector<int>& edgesThis, std::vector<double>& addCoo, std::map<INTERP_KERNEL::Node *,int> mapAddCoo) const;
+    INTERPKERNEL_EXPORT void fillGlobalInfoAbs2(const std::map<INTERP_KERNEL::Node *,int>& mapThis, const std::map<INTERP_KERNEL::Node *,int>& mapOther, int offset1, int offset2, double fact, double baryX, double baryY,
+                                                std::vector<int>& edgesOther, std::vector<double>& addCoo, std::map<INTERP_KERNEL::Node *,int>& mapAddCoo) const;
+    INTERPKERNEL_EXPORT static ElementaryEdge *BuildEdgeFromCrudeDataArray(bool direction, INTERP_KERNEL::Node *start, INTERP_KERNEL::Node *end);
   private:
     bool _direction;
     Edge *_ptr;