Browse Source

undo change

Kim Kulling 5 years ago
parent
commit
e7ae576614
1 changed files with 12 additions and 12 deletions
  1. 12 12
      code/Common/DefaultIOStream.cpp

+ 12 - 12
code/Common/DefaultIOStream.cpp

@@ -51,6 +51,18 @@ using namespace Assimp;
 
 
 namespace {
 namespace {
 
 
+template <size_t sizeOfPointer>
+inline size_t select_ftell(FILE *file) {
+    return ::ftell(file);
+}
+
+template <size_t sizeOfPointer>
+inline int select_fseek(FILE *file, int64_t offset, int origin) {
+    return ::fseek(file, static_cast<long>(offset), origin);
+}
+
+
+    
 #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601)
 #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601)
 template <>
 template <>
 inline size_t select_ftell<8>(FILE *file) {
 inline size_t select_ftell<8>(FILE *file) {
@@ -62,18 +74,6 @@ inline int select_fseek<8>(FILE *file, int64_t offset, int origin) {
     return ::_fseeki64(file, offset, origin);
     return ::_fseeki64(file, offset, origin);
 }
 }
 
 
-#else
-
-template <size_t sizeOfPointer>
-inline size_t select_ftell(FILE *file) {
-    return ::ftell(file);
-}
-
-template <size_t sizeOfPointer>
-inline int select_fseek(FILE *file, int64_t offset, int origin) {
-    return ::fseek(file, static_cast<long>(offset), origin);
-}
-
 #endif // #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601)
 #endif // #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601)
     
     
 } // namespace
 } // namespace