diff --git a/examples/osgdem/osgdem.cpp b/examples/osgdem/osgdem.cpp index 962e42fd3..c0764d6bb 100644 --- a/examples/osgdem/osgdem.cpp +++ b/examples/osgdem/osgdem.cpp @@ -9,6 +9,25 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ +#ifdef WIN32 + +///////////////////////////////////////////////////////////////////////////// +// Disable unavoidable warning messages: + +// 4114: same type qualifier used more than once +// 4201: nonstandard extension used : nameless struct/union +// 4237: "keyword" reserved for future use +// 4251: class needs to have dll-interface to export class +// 4275: non DLL-interface class used as base for DLL-interface class +// 4290: C++ Exception Specification ignored +// 4503: ecorated name length exceeded, name was truncated +// 4786: string too long - truncated to 255 characters + +//#pragma warning(disable : 4103 4114 4201 4237 4251 4275 4290 4335 4786) +#pragma warning(disable : 4503) + +#endif // WIN32 + #include #include #include diff --git a/examples/osgpointsprite/osgpointsprite.cpp b/examples/osgpointsprite/osgpointsprite.cpp index 84152436e..f1cfea552 100755 --- a/examples/osgpointsprite/osgpointsprite.cpp +++ b/examples/osgpointsprite/osgpointsprite.cpp @@ -92,5 +92,7 @@ int main(int, char *[]) viewer.update(); viewer.frame(); } + + return(0); } diff --git a/include/osgTerrain/DataSet b/include/osgTerrain/DataSet index 971a35c4c..fc3656f9e 100644 --- a/include/osgTerrain/DataSet +++ b/include/osgTerrain/DataSet @@ -11,6 +11,17 @@ * OpenSceneGraph Public License for more details. */ +#ifdef WIN32 + +///////////////////////////////////////////////////////////////////////////// +// Disable unavoidable warning messages: +// +// C4503 - decorated name length exceeded, name was truncated +// +#pragma warning(disable : 4503) + +#endif // WIN32 + #ifndef DATASET_H #define DATASET_H 1