Hi list,
these days I wanted to try out OpenSG 2, and had some issues when compiling
with gcc 4.3.1 (running on SuSE 11.0). Thus, attached you find a patch with
the fixes.
Regards
Yvonne
---
Yvonne Jung
Fraunhofer-IGD | Tel.: ++49-6151-155-290
Fraunhoferstr. 5 | Fax.: ++49-6151-155-196
64283 Darmstadt | email: [EMAIL PROTECTED]
Germany | http://www.igd.fhg.de/igd-a4
Index: External/google/sparsehash/densehashtable.h
===================================================================
--- External/google/sparsehash/densehashtable.h (Revision 1577)
+++ External/google/sparsehash/densehashtable.h (Arbeitskopie)
@@ -123,7 +123,7 @@
template <class V, class K, class HF, class ExK, class EqK, class A>
struct dense_hashtable_iterator {
public:
- typedef dense_hashtable<V,K,HF,ExK,EqK,A> dense_hashtable;
+ //typedef dense_hashtable<V,K,HF,ExK,EqK,A> dense_hashtable;
typedef dense_hashtable_iterator<V,K,HF,ExK,EqK,A> iterator;
typedef dense_hashtable_const_iterator<V,K,HF,ExK,EqK,A> const_iterator;
@@ -137,7 +137,7 @@
typedef V* pointer;
// "Real" constructor and default constructor
- dense_hashtable_iterator(const dense_hashtable *h,
+ dense_hashtable_iterator(const dense_hashtable<V,K,HF,ExK,EqK,A> *h,
pointer it, pointer it_end, bool advance)
: ht(h), pos(it), end(it_end) {
if (advance) advance_past_empty_and_deleted();
@@ -167,7 +167,7 @@
// The actual data
- const dense_hashtable *ht;
+ const dense_hashtable<V,K,HF,ExK,EqK,A> *ht;
pointer pos, end;
};
@@ -176,7 +176,7 @@
template <class V, class K, class HF, class ExK, class EqK, class A>
struct dense_hashtable_const_iterator {
public:
- typedef dense_hashtable<V,K,HF,ExK,EqK,A> dense_hashtable;
+ //typedef dense_hashtable<V,K,HF,ExK,EqK,A> dense_hashtable;
typedef dense_hashtable_iterator<V,K,HF,ExK,EqK,A> iterator;
typedef dense_hashtable_const_iterator<V,K,HF,ExK,EqK,A> const_iterator;
@@ -190,7 +190,7 @@
typedef const V* pointer;
// "Real" constructor and default constructor
- dense_hashtable_const_iterator(const dense_hashtable *h,
+ dense_hashtable_const_iterator(const dense_hashtable<V,K,HF,ExK,EqK,A> *h,
pointer it, pointer it_end, bool advance)
: ht(h), pos(it), end(it_end) {
if (advance) advance_past_empty_and_deleted();
@@ -223,7 +223,7 @@
// The actual data
- const dense_hashtable *ht;
+ const dense_hashtable<V,K,HF,ExK,EqK,A> *ht;
pointer pos, end;
};
Index: External/google/sparsehash/hash_fun.h
===================================================================
--- External/google/sparsehash/hash_fun.h (Revision 1577)
+++ External/google/sparsehash/hash_fun.h (Arbeitskopie)
@@ -3,7 +3,7 @@
#define HASH_NAMESPACE __gnu_cxx
#endif
-#include <ext/hash_fun.h>
+#include <hash_fun.h>
#else
#ifndef HASH_NAMESPACE
#define HASH_NAMESPACE osg_hash
Index: System/Image/Squish/OSGSquishSinglecolourfit.cpp
===================================================================
--- System/Image/Squish/OSGSquishSinglecolourfit.cpp (Revision 1577)
+++ System/Image/Squish/OSGSquishSinglecolourfit.cpp (Arbeitskopie)
@@ -22,7 +22,7 @@
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */
-
+#include <climits>
#include "singlecolourfit.h"
#include "colourset.h"
#include "colourblock.h"
Index: System/Image/Squish/OSGSquishAlpha.cpp
===================================================================
--- System/Image/Squish/OSGSquishAlpha.cpp (Revision 1577)
+++ System/Image/Squish/OSGSquishAlpha.cpp (Arbeitskopie)
@@ -22,7 +22,7 @@
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------- */
-
+#include <climits>
#include "alpha.h"
#include <algorithm>
Index: Base/Base/OSGMultiPool.h
===================================================================
--- Base/Base/OSGMultiPool.h (Revision 1577)
+++ Base/Base/OSGMultiPool.h (Arbeitskopie)
@@ -46,6 +46,7 @@
#include <vector>
#include <map>
+#include <typeinfo>
OSG_BEGIN_NAMESPACE
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Opensg-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensg-users
