Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Prepend OCE_ to names of HAVE_IOSTREAM and HAVE_IOSTREAM_H macros in …

…all files
  • Loading branch information...
commit 35e04906e2a2175eff8b499ee0bebf611d85222d 1 parent f1505ad
@mpictor mpictor authored
View
4 CMakeLists.txt
@@ -347,10 +347,10 @@ IF (NOT WIN32)
CHECK_INCLUDE_FILE_CXX(fstream OCE_HAVE_FSTREAM)
CHECK_INCLUDE_FILE_CXX(ios HAVE_IOS)
CHECK_INCLUDE_FILE_CXX(iomanip OCE_HAVE_IOMANIP)
- CHECK_INCLUDE_FILE_CXX(iostream HAVE_IOSTREAM)
+ CHECK_INCLUDE_FILE_CXX(iostream OCE_HAVE_IOSTREAM)
CHECK_INCLUDE_FILE_CXX(fstream.h OCE_HAVE_FSTREAM_H)
CHECK_INCLUDE_FILE_CXX(ios.h HAVE_IOS_H)
- CHECK_INCLUDE_FILE_CXX(iostream.h HAVE_IOSTREAM_H)
+ CHECK_INCLUDE_FILE_CXX(iostream.h OCE_HAVE_IOSTREAM_H)
CHECK_INCLUDE_FILE_CXX(stdlib.h HAVE_STDLIB_H)
CHECK_INCLUDE_FILE_CXX(sys/types.h HAVE_SYS_TYPES_H)
CHECK_INCLUDE_FILE_CXX(sys/select.h HAVE_SYS_SELECT_H)
View
6 inc/Standard_Stream.hxx
@@ -24,13 +24,13 @@
// Unix variant
#ifndef WNT
-#ifdef HAVE_IOSTREAM
+#ifdef OCE_HAVE_IOSTREAM
#include <iostream>
#define USE_STL_STREAM
-#elif defined (HAVE_IOSTREAM_H)
+#elif defined (OCE_HAVE_IOSTREAM_H)
#include <iostream.h>
#else
- #error "check config.h file or compilation options: either HAVE_IOSTREAM or HAVE_IOSTREAM_H should be defined"
+ #error "check config.h file or compilation options: either OCE_HAVE_IOSTREAM or OCE_HAVE_IOSTREAM_H should be defined"
#endif
#ifdef OCE_HAVE_IOMANIP
View
4 oce_build_config.h.cmake
@@ -16,7 +16,7 @@
#cmakedefine OCE_HAVE_FSTREAM 1
-#cmakedefine HAVE_IOSTREAM 1
+#cmakedefine OCE_HAVE_IOSTREAM 1
#cmakedefine OCE_HAVE_IOMANIP 1
@@ -60,7 +60,7 @@
#cmakedefine HAVE_IOS_H 1
/* Define to 1 if you have the <iostream.h> header file. */
-#cmakedefine HAVE_IOSTREAM_H 1
+#cmakedefine OCE_HAVE_IOSTREAM_H 1
/* Define to 1 if you have the <libc.h> header file. */
#cmakedefine HAVE_LIBC_H 1
View
4 oce_install_config.h.cmake
@@ -17,8 +17,8 @@
#cmakedefine OCE_HAVE_FSTREAM 1
#cmakedefine OCE_HAVE_FSTREAM_H 1
-#cmakedefine HAVE_IOSTREAM 1
-#cmakedefine HAVE_IOSTREAM_H 1
+#cmakedefine OCE_HAVE_IOSTREAM 1
+#cmakedefine OCE_HAVE_IOSTREAM_H 1
#cmakedefine OCE_HAVE_LIMITS 1
#cmakedefine OCE_HAVE_CLIMITS 1
View
2  src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
@@ -481,7 +481,7 @@ void BinLDrivers_DocumentRetrievalDriver::CheckShapeSection(
Standard_IStream& IS)
{
if(!IS.eof()) {
-#if defined(WNT) || defined(HAVE_IOSTREAM)
+#if defined(WNT) || defined(OCE_HAVE_IOSTREAM)
const Storage_Position endPos = IS.rdbuf()->pubseekoff(0L, std::ios_base::end, std::ios_base::in);
#else
const Storage_Position endPos = IS.rdbuf()->seekoff(0L, unsafe_ios::end, unsafe_ios::in);
Please sign in to comment.
Something went wrong with that request. Please try again.