ilmbase: provide lib:s without version suffix.

* Style fixes for ilmbase and openexr.
This commit is contained in:
Kacper Kasper
2017-12-17 14:56:06 +01:00
parent ecc2899115
commit 633986446a
4 changed files with 53 additions and 110 deletions

View File

@@ -1,4 +1,4 @@
From 253c255d474d66d6a7c6807ce0deb4ada9022659 Mon Sep 17 00:00:00 2001
From f698920dbb4857505d1943fbef3cc9f3d05a2bae Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 16 Dec 2017 10:52:53 +0100
Subject: gcc2 support
@@ -16,18 +16,9 @@ index ce64b50..8deed8b 100644
return 0;
}
diff --git a/Half/toFloat.cpp b/Half/toFloat.cpp
index 001bc51..fd50b84 100644
index 001bc51..ef2d87f 100644
--- a/Half/toFloat.cpp
+++ b/Half/toFloat.cpp
@@ -135,7 +135,7 @@ int
main ()
{
cout.precision (9);
- cout.setf (ios_base::hex, ios_base::basefield);
+ cout.setf (ios::hex, ios::basefield);
cout << "//\n"
"// This is an automatically generated file.\n"
@@ -160,5 +160,6 @@ main ()
}
@@ -62,27 +53,6 @@ index df2a3e5..c6ae73b 100644
void setFpExceptionHandler (FpExceptionHandler handler);
diff --git a/Imath/ImathMatrix.h b/Imath/ImathMatrix.h
index 3e96c2f..533ad26 100644
--- a/Imath/ImathMatrix.h
+++ b/Imath/ImathMatrix.h
@@ -3242,6 +3242,8 @@ Matrix44<T>::shear (const Shear6<S> &h)
// Implementation of stream output
//--------------------------------
+#define ios_base ios
+
template <class T>
std::ostream &
operator << (std::ostream &s, const Matrix33<T> &m)
@@ -3320,6 +3322,7 @@ operator << (std::ostream &s, const Matrix44<T> &m)
return s;
}
+#undef ios_base
//---------------------------------------------------------------
// Implementation of vector-times-matrix multiplication operators
diff --git a/Imath/ImathVec.h b/Imath/ImathVec.h
index fb859eb..5fa0e91 100644
--- a/Imath/ImathVec.h