diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/libdjvu/Arrays.h | 12 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/libdjvu/GContainer.h | 2 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/libdjvu/GException.h | 3 |
4 files changed, 1 insertions, 16 deletions
diff --git a/admin b/admin -Subproject 85116532467b2bb4c73caf54c106c91a22dbe37 +Subproject 43b0c7bdb9af44dc13b0fd17b95ae172a4a382d diff --git a/kviewshell/plugins/djvu/libdjvu/Arrays.h b/kviewshell/plugins/djvu/libdjvu/Arrays.h index 2e16520c..ca0b1771 100644 --- a/kviewshell/plugins/djvu/libdjvu/Arrays.h +++ b/kviewshell/plugins/djvu/libdjvu/Arrays.h @@ -478,10 +478,8 @@ public: subscript range, you must stop using the pointers returned by prior invocation of this conversion operator. */ operator const TYPE* () const; - -#ifndef __MWERKS__ //MCW can't compile operator const TYPE* (); -#endif + /** Insert new elements into an array. This function inserts #howmany# elements at position #n# into the array. The initial value #val# is copied into the new elements. All array elements previously located at subscripts @@ -528,14 +526,12 @@ ArrayBaseT<TYPE>::operator TYPE* () return &((TYPE *) rep->data)[-rep->minlo]; } -#ifndef __MWERKS__ //MCW can't compile template <class TYPE> inline ArrayBaseT<TYPE>::operator const TYPE* () { const ArrayRep * rep=(const ArrayRep *) get(); return &((const TYPE *) rep->data)[-rep->minlo]; } -#endif template <class TYPE> inline ArrayBaseT<TYPE>::operator const TYPE* () const @@ -903,11 +899,7 @@ public: const GP<TYPE>& operator[](int n) const; // -- CONVERSION operator GP<TYPE>* (); - -#ifndef __MWERKS__ //MCW can't compile operator const GP<TYPE>* (); -#endif - operator const GP<TYPE>* () const; // -- ALTERATION void ins(int n, const GP<TYPE> &val, unsigned int howmany=1); @@ -952,13 +944,11 @@ inline DPArray<TYPE>::operator GP<TYPE>* () return (GP<TYPE> *) DArray<GPBase>::operator GPBase*(); } -#ifndef __MWERKS__ //MCW can't compile template<class TYPE> inline DPArray<TYPE>::operator const GP<TYPE>* () { return (const GP<TYPE> *) DArray<GPBase>::operator const GPBase*(); } -#endif template<class TYPE> inline DPArray<TYPE>::operator const GP<TYPE>* () const diff --git a/kviewshell/plugins/djvu/libdjvu/GContainer.h b/kviewshell/plugins/djvu/libdjvu/GContainer.h index 9a298b04..5b55b15d 100644 --- a/kviewshell/plugins/djvu/libdjvu/GContainer.h +++ b/kviewshell/plugins/djvu/libdjvu/GContainer.h @@ -96,8 +96,6 @@ namespace DJVU { #define GCONTAINER_NO_MEMBER_TEMPLATES 1 #elif defined(_MSC_VER) && !defined(__ICL) #define GCONTAINER_NO_MEMBER_TEMPLATES 1 -#elif defined(__MWERKS__) -#define GCONTAINER_NO_MEMBER_TEMPLATES 1 #else #define GCONTAINER_NO_MEMBER_TEMPLATES 0 #endif diff --git a/kviewshell/plugins/djvu/libdjvu/GException.h b/kviewshell/plugins/djvu/libdjvu/GException.h index 822b668e..41a8b9a8 100644 --- a/kviewshell/plugins/djvu/libdjvu/GException.h +++ b/kviewshell/plugins/djvu/libdjvu/GException.h @@ -229,9 +229,6 @@ private: #if defined(_MSC_VER) #define CPP_SUPPORTS_EXCEPTIONS #endif -#if defined(__MWERKS__) -#define CPP_SUPPORTS_EXCEPTIONS -#endif #if defined(__EXCEPTIONS) #define CPP_SUPPORTS_EXCEPTIONS #endif |