Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
18630b2
)
Eliminate some Visual Studio warnings
author
mpv
<mpv@opencascade.com>
Tue, 11 Aug 2015 08:58:37 +0000
(11:58 +0300)
committer
mpv
<mpv@opencascade.com>
Tue, 11 Aug 2015 08:58:37 +0000
(11:58 +0300)
src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp
patch
|
blob
|
history
src/GeomAlgoAPI/GeomAlgoAPI_Tools.h
patch
|
blob
|
history
src/Model/Model_Data.cpp
patch
|
blob
|
history
src/ModelAPI/ModelAPI_Data.h
patch
|
blob
|
history
src/ParametersPlugin/ParametersPlugin_EvalListener.h
patch
|
blob
|
history
src/ParametersPlugin/ParametersPlugin_Plugin.h
patch
|
blob
|
history
src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
patch
|
blob
|
history
diff --git
a/src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp
b/src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp
index b91780545377145b6981fc355948d0aa128f4aab..c4d9add35d01336f89341f2061786c1be8314968 100644
(file)
--- a/
src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp
+++ b/
src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp
@@
-134,7
+134,7
@@
bool IGESExport(const std::string& theFileName,
// perform shape writing
if( ICW.AddShape( theShape->impl<TopoDS_Shape>() ) ) {
ICW.ComputeModel();
// perform shape writing
if( ICW.AddShape( theShape->impl<TopoDS_Shape>() ) ) {
ICW.ComputeModel();
- return ICW.Write(theFileName.c_str());
+ return ICW.Write(theFileName.c_str())
== Standard_True
;
}
return false;
}
}
return false;
}
diff --git
a/src/GeomAlgoAPI/GeomAlgoAPI_Tools.h
b/src/GeomAlgoAPI/GeomAlgoAPI_Tools.h
index f53385c816d84c4653a99b93ba55cd227063a701..fa950240e7d860c02ee59c790963706c5e46bd83 100644
(file)
--- a/
src/GeomAlgoAPI/GeomAlgoAPI_Tools.h
+++ b/
src/GeomAlgoAPI/GeomAlgoAPI_Tools.h
@@
-13,11
+13,11
@@
namespace GeomAlgoAPI_Tools {
namespace GeomAlgoAPI_Tools {
-class
GEOMALGOAPI_EXPORT
Localizer
+class Localizer
{
public:
{
public:
- Localizer();
- ~Localizer();
+
GEOMALGOAPI_EXPORT
Localizer();
+
GEOMALGOAPI_EXPORT
~Localizer();
private:
std::string myCurLocale;
};
private:
std::string myCurLocale;
};
diff --git
a/src/Model/Model_Data.cpp
b/src/Model/Model_Data.cpp
index bf4661ad2978d34d324e9b73f4dea58f2dce3730..aeb1489c47ac39f298439a7dc4090be4d5a174ed 100644
(file)
--- a/
src/Model/Model_Data.cpp
+++ b/
src/Model/Model_Data.cpp
@@
-44,10
+44,6
@@
#include <string>
#include <string>
-#ifdef WNT // to avoid too long decorated name warning
-#pragma warning( disable : 4503 )
-#endif
-
// myLab contains:
// TDataStd_Name - name of the object
// TDataStd_IntegerArray - state of the object execution, transaction ID of update
// myLab contains:
// TDataStd_Name - name of the object
// TDataStd_IntegerArray - state of the object execution, transaction ID of update
diff --git
a/src/ModelAPI/ModelAPI_Data.h
b/src/ModelAPI/ModelAPI_Data.h
index 22293469911764463a6fd86e1183fb1766ccabcd..1d37ad60f5f88f1494c927a9e66ff84408da4e13 100644
(file)
--- a/
src/ModelAPI/ModelAPI_Data.h
+++ b/
src/ModelAPI/ModelAPI_Data.h
@@
-7,6
+7,10
@@
#ifndef ModelAPI_Data_H_
#define ModelAPI_Data_H_
#ifndef ModelAPI_Data_H_
#define ModelAPI_Data_H_
+#ifdef _WINDOWS // to avoid too long decorated name warning
+#pragma warning( disable : 4503 )
+#endif
+
#include "ModelAPI.h"
#include <string>
#include <list>
#include "ModelAPI.h"
#include <string>
#include <list>
diff --git
a/src/ParametersPlugin/ParametersPlugin_EvalListener.h
b/src/ParametersPlugin/ParametersPlugin_EvalListener.h
index b9004c3d32ff7e749f5bfc7c06c69de92884ef7d..02b5e6c523d4d717def9b701ad1d800b9b6aa088 100644
(file)
--- a/
src/ParametersPlugin/ParametersPlugin_EvalListener.h
+++ b/
src/ParametersPlugin/ParametersPlugin_EvalListener.h
@@
-16,13
+16,13
@@
class ModelAPI_Document;
class ParametersPlugin_Parameter;
class ParametersPlugin_PyInterp;
class ParametersPlugin_Parameter;
class ParametersPlugin_PyInterp;
-class P
ARAMETERSPLUGIN_EXPORT P
arametersPlugin_EvalListener : public Events_Listener
+class ParametersPlugin_EvalListener : public Events_Listener
{
public:
{
public:
- ParametersPlugin_EvalListener();
- virtual ~ParametersPlugin_EvalListener();
+ P
ARAMETERSPLUGIN_EXPORT P
arametersPlugin_EvalListener();
+
PARAMETERSPLUGIN_EXPORT
virtual ~ParametersPlugin_EvalListener();
- virtual void processEvent(const std::shared_ptr<Events_Message>& theMessage);
+
PARAMETERSPLUGIN_EXPORT
virtual void processEvent(const std::shared_ptr<Events_Message>& theMessage);
protected:
double evaluate(const std::string& theExpression, std::string& theError,
protected:
double evaluate(const std::string& theExpression, std::string& theError,
diff --git
a/src/ParametersPlugin/ParametersPlugin_Plugin.h
b/src/ParametersPlugin/ParametersPlugin_Plugin.h
index d4d35283fe705245ca095c054f700fcef2959978..280f00903ee9f38e2e46974f3a4f72abd53e73f9 100644
(file)
--- a/
src/ParametersPlugin/ParametersPlugin_Plugin.h
+++ b/
src/ParametersPlugin/ParametersPlugin_Plugin.h
@@
-12,11
+12,11
@@
/**\class ParametersPlugin_Plugin
* TODO: Add documentation
*/
/**\class ParametersPlugin_Plugin
* TODO: Add documentation
*/
-class P
ARAMETERSPLUGIN_EXPORT P
arametersPlugin_Plugin : public ModelAPI_Plugin
+class ParametersPlugin_Plugin : public ModelAPI_Plugin
{
public:
/// Creates the feature object of this plugin by the feature string ID
{
public:
/// Creates the feature object of this plugin by the feature string ID
- virtual FeaturePtr createFeature(std::string theFeatureID);
+
PARAMETERSPLUGIN_EXPORT
virtual FeaturePtr createFeature(std::string theFeatureID);
public:
ParametersPlugin_Plugin();
public:
ParametersPlugin_Plugin();
diff --git
a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
index 893b33fbf4c52af19adaec2b58b0a7eee71db342..84a0f9884a4a48d848ad74cbbeb36a19aa59e62d 100644
(file)
--- a/
src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
+++ b/
src/SketcherPrs/SketcherPrs_SymbolPrs.cpp
@@
-239,7
+239,9
@@
SketcherPrs_SymbolPrs::~SketcherPrs_SymbolPrs()
aMgr->deleteConstraint(this);
}
aMgr->deleteConstraint(this);
}
-
+#ifdef _WINDOWS
+#pragma warning( disable : 4996 )
+#endif
Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon()
{
Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon()
{