diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | glib/glibmm/dispatcher.cc | 12 | ||||
| -rw-r--r-- | glib/glibmm/ustring.h | 4 | ||||
| -rw-r--r-- | glib/glibmm/value.h | 2 | ||||
| -rw-r--r-- | glib/glibmm/value_custom.h | 4 | ||||
| -rw-r--r-- | glib/glibmmconfig.h.in | 3 | ||||
| -rw-r--r-- | glib/src/iochannel.hg | 2 | ||||
| -rw-r--r-- | glib/src/optiongroup.ccg | 4 | ||||
| -rw-r--r-- | glib/src/thread.hg | 2 |
9 files changed, 34 insertions, 21 deletions
@@ -1,8 +1,8 @@ 2005-01-20 Murray Cumming <murrayc@murrayc.com> * glib/glibmm/class.h: More use of exern "C", with an intermediate - callback, to satisfy the IRIX MipsPro compiler. - * glib/glibmm/container.h: #ifdef out a dynamic_cast that MipsPro + callback, to satisfy the Tru64 compiler. + * glib/glibmm/container.h: #ifdef out a dynamic_cast that Tru64 does not allow, and which I can not think of a better place to put. See the comment in the code. @@ -10,7 +10,7 @@ * glib/glibmm/value.h, value_custom.[h|cc]: Custom boxed types, more #ifdef ABI-changing to add intermediate extern-C callback function, - for the IRIX MipsPro compiler. This might not actually work at runtime, + for the Tru64 compiler. This might not actually work at runtime, but if it does not then lots of funtionality should still work. Conditionally moved the RefPtr Value specialization into object.h, as before. @@ -19,7 +19,7 @@ * configure.in, scripts/cxx.m4, glibmm/glibmmconfig.h.in: Added a compiler test, to see whether it allows use of non extern C functions - as extern C callbacks, because the IRIX MipsPro compiler does not + as extern C callbacks, because the Tru64 compiler does not allow this, but we can not completely fix that without changing ABI, which we can not do on the existing platforms. * glib/src/thread.[hg|ccg]: On (new) platforms that do not allow @@ -32,23 +32,23 @@ spawn.ccg, thread.ccg: Make C callacks separate extern "C" functions instead of static member functions, to - satisfy the IRIX MipsPro compiler. Unfortunately this means that + satisfy the Tru64 compiler. Unfortunately this means that we export some private API. * glib/src/optionentry.hg: Remove the include of value.h, because - it is not used and it causes a MipsPro compile error in + it is not used and it causes a Tru64 compile error in optioncontext.cc because its templates are included before the types that the template uses. * glib/src/optiongroup.ccg: Do not use the StringArrayHandle, - because the MipsPro compiler has problems with it - see comments + because the Tru64 compiler has problems with it - see comments in code. * configure.in, scripts/cxx.m4, glibmm/glibmmconfig.h.in: Added a - compiler test, because the IRIX MipsPro compiler does not allow us + compiler test, because the Tru64 compiler does not allow us to define a template that uses an undefined type, even if we do not use it before defining the type. That's probably correct. * glib/glibmm/containerhandler_helpers.h: When the compiler does not alllow the GObject and GtkObject (dynamic_cast of) specializations here, then put them in glib/glibmm/object.h and - gtkmm/gtk/src/object.hg instead.- needed by MipsPro (IRIX) compiler.. + gtkmm/gtk/src/object.hg instead.- needed by Tru64 compiler.. 2005-01-19 Murray Cumming <murrayc@murrayc.com> @@ -57,8 +57,8 @@ inline initialization of ustring::npos. * glib/glibmm/ustring.[h|cc]: When the compiler does not support the inline initialization of npos, initialize it in the .cc file. - Declare partial specializatoins of the SequenceString inner class - inside the class - needed by MipsPro (IRIX) compiler.. + Declare partial specializations of the SequenceString inner class + inside the class - needed by IRIX MipsPro compiler.. 2005-01-18 Murray Cumming <murrayc@murrayc.com> diff --git a/glib/glibmm/dispatcher.cc b/glib/glibmm/dispatcher.cc index 7312707d..15c63ae3 100644 --- a/glib/glibmm/dispatcher.cc +++ b/glib/glibmm/dispatcher.cc @@ -30,6 +30,18 @@ #ifndef G_OS_WIN32 #include <unistd.h> + +#if defined(_tru64) //TODO: Use the real define +//EINTR is not defined on Tru64 +//I have tried including these +//#include <sys/types.h> +//#include <sys/statvfs.h> +//#include <signal.h> + #ifndef EINTR + #define EINTR 0 + #endif +#endif + #else #include <windows.h> #include <io.h> diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h index 89d7e00a..86578b43 100644 --- a/glib/glibmm/ustring.h +++ b/glib/glibmm/ustring.h @@ -235,7 +235,7 @@ public: #ifdef GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS static const size_type npos = std::string::npos; #else - //The MipsPro compiler (IRIX) says "The indicated constant value is not known", + //The IRIX MipsPro compiler says "The indicated constant value is not known", //so we need to initalize the static member data elsewhere. static const size_type npos; #endif @@ -605,7 +605,7 @@ private: #endif struct SequenceToString; - //The MipsPro (IRIX) compiler needs these partial specializations to be declared here, + //The Tru64 compiler needs these partial specializations to be declared here, //as well as defined later. That's probably correct. murrayc. template <class In> struct SequenceToString<In, char>; diff --git a/glib/glibmm/value.h b/glib/glibmm/value.h index c7412e3a..8e303ff3 100644 --- a/glib/glibmm/value.h +++ b/glib/glibmm/value.h @@ -217,7 +217,7 @@ public: CppType get() const { return CppType(static_cast<CType>(get_boxed())); } }; -//More spec-compliant compilers (such as IRIX MipsPro) need this to be near Glib::Object instead. +//More spec-compliant compilers (such as Tru64) need this to be near Glib::Object instead. #ifdef GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION /** Partial specialization for RefPtr<> to Glib::Object. diff --git a/glib/glibmm/value_custom.h b/glib/glibmm/value_custom.h index 5e779938..85591d53 100644 --- a/glib/glibmm/value_custom.h +++ b/glib/glibmm/value_custom.h @@ -100,7 +100,7 @@ void Value_value_init_func(GValue* value); void Value_value_free_func(GValue* value); void Value_value_copy_func(const GValue* src_value, GValue* dest_value); -//For some reason, the IRIX MipsPro compiler needs these to be defined here. +//For some reason, the Tru64 compiler needs these to be defined here. //Otherwise, it says "function was referenced but not defined". //murrayc @@ -220,7 +220,7 @@ void Value_Pointer<T,PtrT>::set_(PtrT data, Glib::Object*) set_object(const_cast<T*>(data)); } -//More spec-compliant compilers (such as IRIX MipsPro) need this to be near Glib::Object instead. +//More spec-compliant compilers (such as Tru64) need this to be near Glib::Object instead. #ifdef GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION template <class T, class PtrT> inline PtrT Value_Pointer<T,PtrT>::get_(Glib::Object*) const diff --git a/glib/glibmmconfig.h.in b/glib/glibmmconfig.h.in index 6fc0f61a..2a9ec68d 100644 --- a/glib/glibmmconfig.h.in +++ b/glib/glibmmconfig.h.in @@ -20,7 +20,8 @@ #define GLIBMM_GCC #define GLIBMM_DLL #else -#warning "Unknown architecture (send me gcc --dumpspecs or equiv)" +//SGI IRIX MipsPro compiler complains about this even thought it doesn't get this far: +//#warning "Unknown architecture (send me gcc --dumpspecs or equiv)" #endif #else #define GLIBMM_GCC diff --git a/glib/src/iochannel.hg b/glib/src/iochannel.hg index aa8b1b0f..a3bf5905 100644 --- a/glib/src/iochannel.hg +++ b/glib/src/iochannel.hg @@ -38,7 +38,7 @@ extern "C" { typedef struct _GIOChannel GIOChannel; } namespace Glib { //anonymous #ifndef DOXYGEN_SHOULD_SKIP_THIS -//On some compilers, such as the MipsPro compiler, you can not assign +//On some compilers, such as the Tru64 compiler, you can not assign //a non-extern "C" function to a pointer to an extern "C" function. //And static member functions can never be extern "C", //so these must go outside the class. diff --git a/glib/src/optiongroup.ccg b/glib/src/optiongroup.ccg index 5e82ee5e..71c3115d 100644 --- a/glib/src/optiongroup.ccg +++ b/glib/src/optiongroup.ccg @@ -361,7 +361,7 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() // //(*typed_cpp_arg) = array_handle; // - //And the MipsPro (IRIX) compiler does not even like us to instantiate the StringArrayHandle: + //And the Tru64 compiler does not even like us to instantiate the StringArrayHandle: // // cxx: Error: ../../glib/glibmm/containerhandle_shared.h, line 149: the operand // of a pointer dynamic_cast must be a pointer to a complete class type @@ -392,7 +392,7 @@ void OptionGroup::CppOptionEntry::convert_c_to_cpp() { typed_cpp_arg->clear(); - //See comments above about the SUN Forte and MipsPro compilers. + //See comments above about the SUN Forte and Tru64 compilers. char** char_array_next = *typed_arg; while(char_array_next && *char_array_next) diff --git a/glib/src/thread.hg b/glib/src/thread.hg index 4f69fd49..38a86ebe 100644 --- a/glib/src/thread.hg +++ b/glib/src/thread.hg @@ -685,7 +685,7 @@ namespace { //anonymous extern "C" { void Private_DestructorFunc(void* data); - //For some reason, the IRIX MipsPro compiler needs this to be defined here. + //For some reason, the Tru64 compiler needs this to be defined here. //Otherwise, it says "function was referenced but not defined". //murrayc |