Author: janehu Date: 2010-08-18 13:04:55 -0500 (Wed, 18 Aug 2010) New Revision: 4097 Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp Log: This is the correct version for backing up this file. Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2010-08-18 17:02:14 UTC (rev 4096) +++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2010-08-18 18:04:55 UTC (rev 4097) @@ -13,6 +13,7 @@ // Creation Date : 7/17/00 // //------------------------------------------------------------------------- +#include <Standard_Version.hxx> #include <Standard_Stream.hxx> //#include <Standard_SStream.hxx> //#include <Standard_String.hxx> @@ -39,11 +40,15 @@ #include "Handle_Poly_Triangulation.hxx" #include "GCPnts_TangentialDeflection.hxx" #include "BRepAdaptor_Curve.hxx" -#include "STEPControl_Reader.hxx" -#include "IGESControl_Reader.hxx" -#include "STEPControl_Writer.hxx" -#include "IGESControl_Writer.hxx" -#include "STEPControl_StepModelType.hxx" +#ifdef HAVE_OCC_STEP +# include "STEPControl_Reader.hxx" +# include "STEPControl_Writer.hxx" +# include "STEPControl_StepModelType.hxx" +#endif +#ifdef HAVE_OCC_IGES +# include "IGESControl_Reader.hxx" +# include "IGESControl_Writer.hxx" +#endif #include "IFSelect_ReturnStatus.hxx" #include "BndLib_Add3dCurve.hxx" #include "Poly_Polygon3D.hxx" @@ -116,10 +121,6 @@ OCCQueryEngine* OCCQueryEngine::instance_ = NULL; -const int OCCQueryEngine::OCCQE_MAJOR_VERSION = 6; -const int OCCQueryEngine::OCCQE_MINOR_VERSION = 2; -const int OCCQueryEngine::OCCQE_SUBMINOR_VERSION = 0; - typedef std::map<int, TopologyBridge*>::value_type valType; int OCCQueryEngine::iTotalTBCreated = 0; int OCCQueryEngine::total_coedges = 0; @@ -177,29 +178,22 @@ int OCCQueryEngine::get_major_version() { - return OCCQE_MAJOR_VERSION; + return OCC_VERSION_MAJOR; }