OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-07-30 13:05:50 +03:00
Code

0024312: Compilation issues on OS X 10.9 Maverics SDK

Browse Source 
Update glext.h. Fix compiler errors.
This commit is contained in:
kgv 2013-11-02 18:51:57 +04:00 committed by abv
parent aa65144716
commit 9293178ba0
5 changed files with 9398 additions and 10094 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
View File

@ -112,10 +112,10 @@ void BinLDrivers_DocumentStorageDriver::Write
ofstream anOS (aFileName.ToCString(), ios::in | ios::binary | ios::ate); ofstream anOS (aFileName.ToCString(), ios::in | ios::binary | ios::ate);
#else #else
ofstream anOS (aFileName.ToCString(), ios::ate); ofstream anOS (aFileName.ToCString(), ios::ate);
//ofstream anOS (aFileName.ToCString(), ios::out| ios::binary | ios::ate); //ofstream anOS (aFileName.ToCString(), ios::out| ios::binary | ios::ate);
#endif #endif
#ifdef DEB #ifdef DEB
const Standard_Integer aP = (Standard_Integer) anOS.tellp(); const Standard_Integer aP = (Standard_Integer) anOS.tellp();
cout << "POS = " << aP <<endl; cout << "POS = " << aP <<endl;
#endif #endif
//#endif //#endif
@ -127,10 +127,10 @@ void BinLDrivers_DocumentStorageDriver::Write
for (; anIterS.More(); anIterS.Next()) for (; anIterS.More(); anIterS.Next())
anIterS.ChangeValue().WriteTOC (anOS); anIterS.ChangeValue().WriteTOC (anOS);
// Shapes Section is the last one, it indicates the end of the table. // Shapes Section is the last one, it indicates the end of the table.
BinLDrivers_DocumentSection aShapesSection (SHAPESECTION_POS, BinLDrivers_DocumentSection aShapesSection (SHAPESECTION_POS,
Standard_False); Standard_False);
aShapesSection.WriteTOC (anOS); aShapesSection.WriteTOC (anOS);
// 3. Write document contents // 3. Write document contents
// (Storage data to the stream) // (Storage data to the stream)
@ -151,7 +151,7 @@ void BinLDrivers_DocumentStorageDriver::Write
aSection.Write (anOS, aSectionOffset); aSection.Write (anOS, aSectionOffset);
} }
// End of processing: close structures and check the status // End of processing: close structures and check the status
myPAtt.Destroy(); // free buffer myPAtt.Destroy(); // free buffer
myEmptyLabels.Clear(); myEmptyLabels.Clear();
myMapUnsupported.Clear(); myMapUnsupported.Clear();
@ -173,7 +173,7 @@ void BinLDrivers_DocumentStorageDriver::Write
#if defined(_DEBUG) || defined(DEB) #if defined(_DEBUG) || defined(DEB)
WriteMessage (anErrorStr + aMethStr + WriteMessage (anErrorStr + aMethStr +
"Problem with the file stream, rdstate=" "Problem with the file stream, rdstate="
+ anOS.rdstate()); + (Standard_Integer )anOS.rdstate());
#else #else
TCollection_ExtendedString aStr = TCollection_ExtendedString aStr =
anErrorStr + aMethStr + "Problem writing the file "; anErrorStr + aMethStr + "Problem writing the file ";
@ -188,7 +188,7 @@ void BinLDrivers_DocumentStorageDriver::Write
//======================================================================= //=======================================================================
//function : UnsupportedAttrMsg //function : UnsupportedAttrMsg
//purpose : //purpose :
//======================================================================= //=======================================================================
void BinLDrivers_DocumentStorageDriver::UnsupportedAttrMsg void BinLDrivers_DocumentStorageDriver::UnsupportedAttrMsg
@ -412,11 +412,11 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection
// Info // Info
aFileDriver.WriteInfo aFileDriver.WriteInfo
(1, // nbObj (1, // nbObj
BinLDrivers::StorageVersion(), BinLDrivers::StorageVersion(),
Storage_Schema::ICreationDate(), Storage_Schema::ICreationDate(),
TCollection_AsciiString(SchemaName(),'?'), TCollection_AsciiString(SchemaName(),'?'),
1, // schemaVersion 1, // schemaVersion
theData->ApplicationName(), theData->ApplicationName(),
theData->ApplicationVersion(), theData->ApplicationVersion(),
theData->DataType(), theData->DataType(),
@ -441,9 +441,9 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection
SetIsError(Standard_True); SetIsError(Standard_True);
} }
#ifdef DEB #ifdef DEB
const Standard_Integer aP = (Standard_Integer) aFileDriver.Tell(); const Standard_Integer aP = (Standard_Integer) aFileDriver.Tell();
cout << "POS = " << aP <<endl; cout << "POS = " << aP <<endl;
#endif #endif
aFileDriver.Close(); aFileDriver.Close();
} }
@ -462,7 +462,7 @@ void BinLDrivers_DocumentStorageDriver::WriteMessage
//======================================================================= //=======================================================================
//function : AddSection //function : AddSection
//purpose : //purpose :
//======================================================================= //=======================================================================
void BinLDrivers_DocumentStorageDriver::AddSection void BinLDrivers_DocumentStorageDriver::AddSection
@ -474,7 +474,7 @@ void BinLDrivers_DocumentStorageDriver::AddSection
//======================================================================= //=======================================================================
//function : WriteSection //function : WriteSection
//purpose : //purpose :
//======================================================================= //=======================================================================
void BinLDrivers_DocumentStorageDriver::WriteSection void BinLDrivers_DocumentStorageDriver::WriteSection

2
src/InterfaceGraphic/InterfaceGraphic_Cocoa.hxx
View File

@ -35,6 +35,6 @@
#define EXPORT #define EXPORT
#endif #endif
#endif InterfaceGraphic_CocoaHeader #endif // InterfaceGraphic_CocoaHeader
#endif // __APPLE__ #endif // __APPLE__

2
src/OpenGl/OpenGl_Context.cxx
View File

@ -596,7 +596,7 @@ static void APIENTRY debugCallbackWrap(unsigned int theSource,
unsigned int theSeverity, unsigned int theSeverity,
int /*theLength*/, int /*theLength*/,
const char* theMessage, const char* theMessage,
void* theUserParam) const void* theUserParam)
{ {
OpenGl_Context* aCtx = (OpenGl_Context* )theUserParam; OpenGl_Context* aCtx = (OpenGl_Context* )theUserParam;
aCtx->PushMessage (theSource, theType, theId, theSeverity, theMessage); aCtx->PushMessage (theSource, theType, theId, theSeverity, theMessage);

19461
src/OpenGl/glext.h
View File

File diff suppressed because it is too large Load Diff

1
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -93,7 +93,6 @@
#endif #endif
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX) #elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
#include <Cocoa_Window.hxx> #include <Cocoa_Window.hxx>
#include <tk.h>
#else #else
#include <Xw_Window.hxx> #include <Xw_Window.hxx>
#include <X11/Xlib.h> /* contains some dangerous #defines such as Status, True etc. */ #include <X11/Xlib.h> /* contains some dangerous #defines such as Status, True etc. */