Fix build failures on Windows by WMayer

Patch request from WMayer to fix build failures on Windows.
This commit is contained in:
balazs-bamer
2014-12-24 10:06:18 +01:00
committed by wmayer
parent 00f245efdd
commit 14014bc61a
5 changed files with 9 additions and 25 deletions

View File

@@ -63,8 +63,6 @@ App::DocumentObjectExecReturn *Cut::execute(void)
//Perform error checking
bool res;
//Begin Construction
try{
@@ -109,7 +107,7 @@ App::DocumentObjectExecReturn *Cut::execute(void)
return new App::DocumentObjectExecReturn("Resulting shape is null");
}
this->Shape.setValue(aCutShape);
return 0;
} //End Try
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();

View File

@@ -122,8 +122,6 @@ App::DocumentObjectExecReturn *Filling::execute(void)
unsigned int Mdeg = MaxDeg.getValue();
unsigned int Mseg = MaxSegments.getValue();
bool res;
//Perform error checking
@@ -427,8 +425,6 @@ void appconstr_pt(BRepFill_Filling& builder,const App::PropertyLinkSubList& aVer
void appinitface(BRepFill_Filling& builder,const App::PropertyLinkSubList& aFace){
int res;
if(aFace.getSize()>1){Standard_Failure::Raise("Only one face may be used for the initial face");return;}
Part::TopoShape ts;

View File

@@ -91,8 +91,6 @@ App::DocumentObjectExecReturn *Sewing::execute(void)
//Perform error checking
bool res;
//Begin Construction
try{
@@ -113,8 +111,7 @@ App::DocumentObjectExecReturn *Sewing::execute(void)
if (aShape.IsNull())
return new App::DocumentObjectExecReturn("Resulting shape is null");
this->Shape.setValue(aShape);
return 0;
} //End Try
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();

View File

@@ -47,7 +47,7 @@ PyDoc_STRVAR(module_SurfaceGui_doc,
/* Python entry */
extern "C" {
void PartGuiExport initSurfaceGui()
void SurfaceGuiExport initSurfaceGui()
{
if (!Gui::Application::Instance) {
PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");

View File

@@ -24,26 +24,19 @@
#ifndef GUI_PRECOMPILED_H
#define GUI_PRECOMPILED_H
/*#include <FCConfig.h>
// Importing of App classes
#ifdef FC_OS_WIN32
# define SurfaceAppExport __declspec(dllimport)
# define SurfaceGuiExport __declspec(dllexport)
#else // for Linux
# define SurfaceAppExport
# define SurfaceGuiExport
#endif*/
#include <FCConfig.h>
// Importing of App classes
#ifdef FC_OS_WIN32
# define PartExport __declspec(dllimport)
# define PartGuiExport __declspec(dllimport)
# define SurfaceAppExport __declspec(dllimport)
# define SurfaceGuiExport __declspec(dllexport)
#else // for Linux
# define PartExport
# define PartGuiExport
# define PartExport
# define PartGuiExport
# define SurfaceAppExport
# define SurfaceGuiExport
#endif
#ifdef _PreComp_