remove OSF1 support

cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.C

@@ -99,7 +99,7 @@ int BookmarkEdit::g_modified_count = 0;
 #define THIS_CLASS BookmarkEdit
 #define ON_ACTIVATE(WOBJ,FUNC) \
   (WOBJ).SetActivateCallback (this, (WWL_FUN) &THIS_CLASS::FUNC)
-#if defined(__STDC__) || defined(hpux) || defined(__osf__)
+#if defined(__STDC__) || defined(hpux)
 #define BUTTON(PARENT,NAME) \
   WXmPushButtonGadget NAME (PARENT, #NAME, WAutoManage); \
   ON_ACTIVATE (NAME, NAME)

cde/programs/dtinfo/dtinfo/src/Agents/HelpAgent.hh

@@ -95,11 +95,7 @@ private:
   Cursor f_cursor;
   XrmDatabase f_appXrmDb;
 
-#if defined(__osf__)
-  friend inline HelpAgent &help_agent();
-#else
   friend HelpAgent &help_agent();
-#endif
 
   static HelpAgent *g_help_agent;
 };

cde/programs/dtinfo/dtinfo/src/Agents/IcccmAgent.C

@@ -372,24 +372,16 @@ IcccmAgent::own_selection(Widget w, Atom selection, IcccmAgent* ia,
 		f_selection_owner = this;
 		f_owning_selection = selection;
 		f_owning_widget = w;
-#if defined(__osf__)
-		if (fs != NULL)
-#else
 		if (fs)
-#endif /* __osf__ */
-#if defined(SC3) || defined (__osf__)
+#if defined(SC3)
 		    (ia->*fs)();
 #else
 		    (((IcccmAgent*)f_real_object)->*fs)();
 #endif
 	}
 	else {
-#if defined(__osf__)
-	    if (ff != NULL)
-#else
 	    if (ff)
-#endif /* __osf__ */
-#if defined(SC3) || defined (__osf__)
+#if defined(SC3)
 		(ia->*ff)();
 #else
 		(((IcccmAgent*)f_real_object)->*ff)();

cde/programs/dtinfo/dtinfo/src/Agents/PrefAgentMotif.C

@@ -237,7 +237,7 @@ public:
 #define IS_CHANGED(X) (((Value *) (X).UserData())->changed)
 #define SET_CHANGED(X,V) ((Value *) (X).UserData())->changed = V
 
-#if defined(__STDC__) || defined(hpux) || defined(__osf__)
+#if defined(__STDC__) || defined(hpux)
 #define ATTACH_VALUE(X,T,V) (X).UserData ((void *) new T##Value(V))
 #define SET_VALUE(X,T,V) ((T##Value *) (X).UserData())->set_value(V)
 #define ORIGINAL_VALUE(X,T) ((T##Value *) (X).UserData())->original

cde/programs/dtinfo/dtinfo/src/Basic/Atomizer.hh

@@ -58,11 +58,9 @@ public: // functions
 // a char * as an int.  hopefully, no one calls
 // them and they can be eliminated.
 
-#ifndef __osf__
   size_t value() { return ((size_t) f_value); }
   operator int () 
     { return ((size_t) f_value); }
-#endif
 
   operator const char * ()
     { return (f_value); }

cde/programs/dtinfo/dtinfo/src/Basic/Buffer.hh

@@ -75,13 +75,8 @@ public:
 
   void write (const int integer);
 
-#ifndef __osf__
   void write (const size_t integer)
     { write ((size_t) ((void *) integer)); }
-#else
-  void write (const unsigned int integer)
-    { write ((int) integer); }
-#endif
 
   void write (const char *string);
   void write (const char *bytes, u_int size, u_int length);

cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C

@@ -176,7 +176,7 @@ FolioObject::notify (u_int notify_type, void *notify_data)
 // /////////////////////////////////////////////////////////////////
 
 void
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
 FolioObject::add_dependent (FolioObject *dependent, notify_handler_t handler,
 #else
 FolioObject::add_dependent (void *dependent, notify_handler_t handler,
@@ -184,7 +184,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
 			    u_int notify_type, void *dependent_data)
 {
   // Adds to begining because that's easiest.
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
   f_dependents = new Dependent (&f_dependents, f_dependents,
 				dependent, NULL, handler,
 				notify_type, dependent_data);
@@ -206,7 +206,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
   // by mistake like this.  We'll just have to cast it to a FolioObject
   // when the call through it is made and hope the compiler doesn't
   // expect it to point to an actual FolioObject (or whatever, eg: WWL). 
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
   ON_DEBUG(printf ("@@@ adding to depend_on_list of %p\n", dependent));
   dependent->f_depend_on_list =
     new DependOnList (dependent->f_depend_on_list, f_dependents);
@@ -244,7 +244,7 @@ FolioObject::remove_depend_on (FolioObject *target, Dependent *d)
 // /////////////////////////////////////////////////////////////////
 
 void
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
 FolioObject::remove_dependent (FolioObject *dependent,
 #else
 FolioObject::remove_dependent (void *dependent,
@@ -258,7 +258,7 @@ FolioObject::remove_dependent (void *dependent,
   // That means that each handler added must be removed!
   for (d = &f_dependents; *d != NULL; d = &((*d)->f_next))
     {
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
       if ((*d)->f_dependent      == dependent   &&
 #else
       if ((*d)->f_dependent      == (FolioObject*)dependent   &&
@@ -272,7 +272,7 @@ FolioObject::remove_dependent (void *dependent,
 	  // f_folio_object will be NULL if the Dependent object was
 	  // created in add_dependent!  DJB 11/10/92 
 	  assert ((*d)->f_folio_object != NULL);
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
 	  remove_depend_on (dependent, *d);
 #else
 	  remove_depend_on ((FolioObject*)dependent, *d);
@@ -342,7 +342,7 @@ FolioObject::release_depend_on_list()
 // by deleting that handle!!! 
 
 void
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
 FolioObject::observe (FolioObject *real_this, FolioObject *target,
 #else
 FolioObject::observe (void *real_this, FolioObject *target,
@@ -358,7 +358,7 @@ FolioObject::observe (void *real_this, FolioObject *target,
   // ---
   // OK, instead we will have to pass in the "real" this pointer which
   // may be different from the this pointer visible in this routine. 
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
   target->f_dependents =
     new Dependent (&target->f_dependents, target->f_dependents,
 		   real_this, this,

cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh

@@ -54,7 +54,7 @@ typedef void (FolioObject::* notify_handler_t)
   (FolioObject *object, u_int notify_type,
    void *call_data, void *client_data);
 
-#if defined(__STDC__) || defined(hpux) || defined(__osf__)
+#if defined(__STDC__) || defined(hpux)
 #define DEF_CLASS(C) \
   virtual ClassType type() const; \
   static ClassType C##Class
@@ -70,11 +70,7 @@ typedef void (FolioObject::* notify_handler_t)
   ClassType C::C/**/Class = (ClassType) &C::C/**/Class
 #endif
 
-#ifdef __osf__
-  typedef char * ClassType;
-#else
   typedef int ClassType;
-#endif
 
 class FolioObject
 {
@@ -94,7 +90,7 @@ public: // functions
 #define AddDependentd(CB, TYPE, DATA) \
   add_dependent (this, (notify_handler_t)CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
   void add_dependent (FolioObject *dependent, notify_handler_t handler,
 		      u_int notify_type, void *dependent_data = NULL);
 #else
@@ -107,7 +103,7 @@ public: // functions
 #define RemoveDependentd(CB, TYPE, DATA) \
   remove_dependent(this, (notify_handler_t)CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
   void remove_dependent (FolioObject *dependent, notify_handler_t handler,
 			 u_int notify_type, void *dependent_data = NULL);
 #else
@@ -123,7 +119,7 @@ public: // functions
 #define Observed(TARG, TYPE, CB, DATA) \
   observe (this, TARG, (notify_handler_t) CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(__SunOS)
+#if defined(SC3) || defined(__SunOS)
   void observe (FolioObject *real_this, FolioObject *target,
 		notify_handler_t callback, u_int notify_type,
 		void *client_data = NULL);

cde/programs/dtinfo/dtinfo/src/Managers/PrefMgr.C

@@ -80,7 +80,7 @@ pref_mgr()
 }
 #endif
 
-#if defined(__STDC__) || defined(hpux) || defined(__osf__)
+#if defined(__STDC__) || defined(hpux)
 # define DEFSYM(S) PrefSymbol PrefMgr::S = (PrefSymbol) #S
 #else
 # define DEFSYM(S) PrefSymbol PrefMgr::S = (PrefSymbol) "S"

cde/programs/dtinfo/dtinfo/src/OliasSearch/ResultID.C

@@ -44,12 +44,7 @@ ResultID::sq () {
 
 const char *
 ResultID::display_as () {
-#ifdef __osf__
-    UAS_String& temp_string =  *(UAS_String*)fResults->query();
-    return (char *) temp_string;
-#else
     return (char *)*(UAS_String *) fResults->query();
-#endif
 }
 
 UAS_Pointer<UAS_SearchResults>

cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C

@@ -63,8 +63,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
-#if !defined(hpux) && !defined(__osf__) && \
-    !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
+#if !defined(hpux) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <sysent.h>
 #endif
 #include <sys/types.h>

cde/programs/dtinfo/dtinfo/src/Query/QueryEditor.C

@@ -579,24 +579,7 @@ QueryEditor::fill_menu()
 
   // Do not want first item (Current Section)
 
-#ifdef __osf__
-#if 1
-  Widget w = f_scope_option.SubMenuId();
-  WComposite temp_composite(w);
-  WXmPushButton(temp_composite.Children()[0]).Unmanage();
-#else
-  int i = 0;
-  Widget w = f_scope_option.SubMenuId();;
-  Arg args[1];
-  WidgetList wl;
-  
-  XtSetArg(args[i], XmNchildren, &wl); i++;
-  XtGetValues(w, args, i);
-  XtUnmanageChild(wl[0]);
-#endif
-#else
   WXmPushButton(WComposite(f_scope_option.SubMenuId()).Children()[0]).Unmanage();
-#endif
 
   f_scope_option.
       MenuHistory (WComposite(f_scope_option.SubMenuId()).Children()[1]);

cde/programs/dtinfo/dtinfo/src/Support/xList.hh

@@ -71,8 +71,7 @@ private:
 };
 
 template <class T>
-#if defined(_IBMR2) || defined(__osf__) || \
-    defined(linux) || defined(CSRG_BASED) || defined(sun)
+#if defined(_IBMR2) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 class xList : public List_base
 #else
 class xList : private List_base
@@ -83,8 +82,7 @@ class xList : private List_base
 #ifdef SC3
 friend class List_Iterator<T>;
 #else
-#if !defined(_IBMR2) && !defined(__osf__) && \
-    !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
+#if !defined(_IBMR2) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 template <class T> friend class List_Iterator;
 #endif
 #endif
@@ -120,8 +118,7 @@ public:
 
 
 template <class T>
-#if defined(_IBMR2) || defined(__osf__) || defined(linux) || \
-    defined(CSRG_BASED) || defined(sun)
+#if defined(_IBMR2) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 class List_Iterator : public List_Iterator_base
 #else
 class List_Iterator : private List_Iterator_base

cde/programs/dtinfo/dtinfo/src/Templates.C

@@ -277,144 +277,6 @@ class UpdateMenu;
 
 #else
 
-#ifdef __osf__
-
-#pragma define_template CC_TValSlist<SegClientData*> 
-#pragma define_template CC_TValSlistIterator<SegClientData*> 
-#pragma define_template UAS_Receiver<UpdateMenu>
-#pragma define_template UAS_PtrList<UAS_String>
-#pragma define_template UAS_Pointer<UAS_String>
-
-#pragma define_template UAS_Pointer<UAS_Common>
-#pragma define_template UAS_Pointer<UAS_EmbeddedObject>
-#pragma define_template UAS_Pointer<UAS_Collection>
-#pragma define_template UAS_Pointer<UAS_Path>
-#pragma define_template UAS_Pointer<UAS_StyleSheet>
-#pragma define_template UAS_Pointer<Graphic>
-#pragma define_template UAS_Pointer<Mark>
-#pragma define_template UAS_Pointer<MarkUnitInfo>
-
-#pragma define_template UAS_List<UAS_StyleSheet>
-#pragma define_template UAS_List<UAS_Common>
-#pragma define_template UAS_List<UAS_SearchResults>
-#pragma define_template UAS_List<UAS_SearchEngine>
-
-#pragma define_template UAS_List<MarkUnitInfo>
-
-#pragma define_template UAS_PtrList<FactoryEntry>
-#pragma define_template UAS_PtrList<MMDB>
-#pragma define_template UAS_PtrList<const char>
-
-#pragma define_template UAS_Pointer<UAS_BookcaseEntry>
-#pragma define_template UAS_Pointer<DtSR_BookcaseSearchEntry>
-#pragma define_template UAS_Pointer<DtSR_SearchResults>
-#pragma define_template UAS_Pointer<DtSR_SearchResultsEntry>
-#pragma define_template UAS_Pointer<DtSR_SearchEngine>
-#pragma define_template Dict<UAS_String, UAS_Pointer<DtSR_SearchResultsEntry> >
-#pragma define_template Dict<UAS_String, int>
-#pragma define_template Dict<UAS_String, unsigned long>
-#pragma define_template DictIter<UAS_String, unsigned long>
-#pragma define_template DictIter<UAS_String, UAS_Pointer<DtSR_SearchResultsEntry> >
-#pragma define_template UAS_List<DtSR_BookcaseSearchEntry>
-#pragma define_template UAS_List<DtSR_Stems>
-#pragma define_template UAS_List<UAS_List<UAS_String> >
-
-#pragma define_template UAS_ObjList<UAS_String>
-
-#pragma define_template xList<Ancestor *>
-#pragma define_template xList<UAS_Pointer<UAS_Common> >
-#pragma define_template xList<BookTab *>
-#pragma define_template xList<MarkTml *>
-#pragma define_template xList<MarkIcon *>
-#pragma define_template xList<NodeWindowAgent *>
-#pragma define_template xList<LibraryAgent *>
-#pragma define_template xList<MarkBase *>
-#pragma define_template xList<MarkCanvas *>
-#pragma define_template xList<UAS_Pointer<Mark> >
-#pragma define_template xList<Mark_mmdb *>
-#pragma define_template xList<const char *>
-#pragma define_template xList<MarkBase::open_func_t>
-#pragma define_template xList<MarkBase::mb_create_func_t>
-#pragma define_template xList<UAS_Pointer<Mark> >
-
-#pragma define_template xList<UAS_Pointer<Graphic > >
-#pragma define_template xList<Graphic *>
-#pragma define_template xList<GraphicAgent *>
-#pragma define_template xList<int>
-#pragma define_template xList<long>
-#pragma define_template xList<unsigned long>
-#pragma define_template xList<BookmarkEdit *>
-#pragma define_template xList<UAS_SearchScope *>
-#pragma define_template xList<InfobaseEntry *>
-#pragma define_template xList<Header *>
-#pragma define_template xList<PixmapPidObj *>
-#pragma define_template xList<PsProcess *>
-
-#pragma define_template UAS_Sender<UAS_SearchMsg>
-#pragma define_template UAS_Sender<UAS_StatusMsg>
-#pragma define_template UAS_Sender<UAS_PartialDataMsg>
-#pragma define_template UAS_Sender<MarkCreated>
-#pragma define_template UAS_Sender<EditMark>
-#pragma define_template UAS_Sender<ViewMark>
-#pragma define_template UAS_Sender<MarkChanged>
-#pragma define_template UAS_Sender<MarkMoved>
-#pragma define_template UAS_Sender<MarkDeleted>
-#pragma define_template UAS_Sender<MarkSelectionChanged>
-#pragma define_template UAS_Sender<UpdateMenu>
-#pragma define_template UAS_PtrList<UAS_Sender<UpdateMenu> >
-#pragma define_template UAS_PtrList<UAS_Receiver<UpdateMenu> >
-#pragma define_template UAS_Sender<LinkAction>
-#pragma define_template UAS_Sender<UAS_DocumentRetrievedMsg>
-#pragma define_template UAS_Sender<UAS_CollectionRetrievedMsg>
-#pragma define_template UAS_Sender<HistoryAdd>
-#pragma define_template UAS_Sender<HistoryDelete>
-#pragma define_template UAS_Sender<SelectionChanged>
-#pragma define_template UAS_Sender<DetachGraphic>
-#pragma define_template UAS_Sender<ReAttachGraphic>
-#pragma define_template UAS_Sender<ScopeCreated>
-#pragma define_template UAS_Sender<ScopeDeleted>
-#pragma define_template UAS_Sender<ScopeRenamed>
-#pragma define_template UAS_Sender<InputReady>
-#pragma define_template UAS_Sender<WantInputReady>
-#pragma define_template UAS_Sender<WantInputReadyCancel>
-#pragma define_template UAS_Sender<CancelOperation>
-
-#pragma define_template UAS_Receiver<LinkAction>
-#pragma define_template UAS_Receiver<UAS_CollectionRetrievedMsg>
-#pragma define_template UAS_Receiver<UAS_DocumentRetrievedMsg>
-#pragma define_template UAS_Receiver<HistoryAdd>
-#pragma define_template UAS_Receiver<HistoryDelete>
-#pragma define_template UAS_Receiver<SelectionChanged>
-#pragma define_template UAS_Receiver<DetachGraphic>
-#pragma define_template UAS_Receiver<ReAttachGraphic>
-#pragma define_template UAS_Receiver<DisplayGraphic>
-#pragma define_template UAS_Receiver<InputReady>
-#pragma define_template UAS_Receiver<WantInputReady>
-#pragma define_template UAS_Receiver<WantInputReadyCancel>
-#pragma define_template UAS_Receiver<CancelOperation>
-#pragma define_template UAS_Receiver<UAS_LibraryDestroyedMsg>
- 
-#pragma define_template Stack<char>
-#pragma define_template Stack<char *>
-
-#pragma define_template Stack<_dtCvSegment*>
-#pragma define_template Stack<PartialElementFeatures*>
-#pragma define_template Stack<TableDefn*>
-#pragma define_template Stack<TGDefn*>
-#pragma define_template Stack<SegClientData*>
-
-#pragma define_template CC_TPtrSlist<ColDefn>
-#pragma define_template CC_TPtrSlist<ColFormat>
-#pragma define_template CC_TPtrSlist<RowDefn>
-
-#pragma define_template hashTable<FontEntry,char>
-#pragma define_template Stack<connective_t>
- 
-#pragma define_template CC_TPtrDlist<sr_DtCvSegment>
-#pragma define_template UAS_Pointer<UAS_List<DtSR_BookcaseSearchEntry> >
-
-#else
-
 typedef UAS_Pointer<UAS_String>                 _ptrString_;
 typedef UAS_Pointer<UAS_Common>                 _ptrCommon_;
 typedef UAS_Pointer<UAS_EmbeddedObject>         _ptrEmbeddedObject_;
@@ -558,7 +420,6 @@ typedef Stack<NTerminal*> _stkNTPtr_;
 /* Basic subdir refs */
 typedef CC_TPtrDlist<sr_DtCvSegment> _ccTPtrDLstCvSegmnt_;
 
-#endif
 #endif
 #endif
 

cde/programs/dtinfo/dtinfo/src/Templates2.C

@@ -183,82 +183,3 @@ class RowDefn;
 #pragma define(CC_TPtrDlist<sr_DtCvSegment>)
 
 #endif
-
-#ifdef __osf__
-
-#pragma define_template xList<InputMgrData*>
-#pragma define_template UAS_PtrList<UAS_Receiver<EditMark> >
-#pragma define_template UAS_PtrList<UAS_Receiver<ViewMark> >
-#pragma define_template UAS_PtrList<UAS_Receiver<MarkDeleted> >
-#pragma define_template UAS_PtrList<UAS_Receiver<MarkChanged> >
-#pragma define_template hashTable<CC_String, FontList>
-#pragma define_template UAS_PtrList<UAS_Sender<UAS_PartialDataMsg> >
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_PartialDataMsg> >
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_PartialDataMsg> >
-#pragma define_template UAS_Pointer<UAS_SearchEngine>
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_DocumentRetrievedMsg> >
-#pragma define_template UAS_PtrList<UAS_Sender<UAS_StatusMsg> >
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_StatusMsg> >
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_LibraryDestroyedMsg> >
-#pragma define_template UAS_PtrList<UAS_Sender<UAS_CollectionRetrievedMsg> >
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_CollectionRetrievedMsg> >
-#pragma define_template UAS_List<UAS_TextRun>
-#pragma define_template UAS_Pointer<UAS_SearchResultsEntry>
-#pragma define_template UAS_PtrList<UAS_Receiver<ScopeCreated> >
-#pragma define_template UAS_PtrList<UAS_Receiver<ScopeDeleted> >
-#pragma define_template UAS_PtrList<UAS_Sender<ScopeRenamed> >
-#pragma define_template UAS_PtrList<UAS_Receiver<ScopeRenamed> >
-#pragma define_template UAS_Pointer<UAS_SearchResults>
-#pragma define_template UAS_PtrList<UAS_Sender<UAS_SearchMsg> >
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_SearchMsg> >
-#pragma define_template UAS_Pointer<DtSR_Stems>
-#pragma define_template CC_TPtrSlist<kv_pair<FontEntry, char> >
-#pragma define_template pointer_vector<CC_TPtrSlist<kv_pair<FontEntry, char> > >
-#pragma define_template UAS_PtrList<UAS_Sender<EditMark> >
-#pragma define_template UAS_PtrList<UAS_Receiver<EditMark> >
-#pragma define_template UAS_PtrList<UAS_Receiver<ViewMark> >
-#pragma define_template UAS_PtrList<UAS_Receiver<MarkDeleted> >
-#pragma define_template UAS_PtrList<UAS_Receiver<MarkChanged> >
-#pragma define_template UAS_PtrList<UAS_Receiver<DetachGraphic> >
-#pragma define_template UAS_PtrList<UAS_Receiver<ReAttachGraphic> >
-#pragma define_template UAS_PtrList<UAS_Sender<CancelOperation> >
-#pragma define_template UAS_PtrList<UAS_Sender<InputReady> >
-
-#pragma define_template UAS_Pointer<UAS_List<UAS_String> >
-#pragma define_template UAS_PtrList<UAS_Sender<LinkAction> >
-#pragma define_template UAS_PtrList<UAS_Receiver<LinkAction> >
-#pragma define_template UAS_PtrList<UAS_Sender<DisplayGraphic> >
-#pragma define_template CC_TValSlist<char>
-#pragma define_template CC_TValSlist<char*>
-#pragma define_template CC_TValSlist<_dtCvSegment*>
-#pragma define_template CC_TValSlist<PartialElementFeatures*>
-#pragma define_template CC_TValSlist<TableDefn*>
-#pragma define_template CC_TValSlist<TGDefn*>
-#pragma define_template UAS_Receiver<UAS_SearchMsg>
-#pragma define_template UAS_PtrList<UAS_Sender<UAS_CancelRetrievalMsg> >
-#pragma define_template CC_TValSlist<UAS_String>
-
-#pragma define_template kv_pair<FontEntry, char>
-#pragma define_template kv_pair<CC_String, FontList>
-#pragma define_template kv_pair<CC_String, FontList>
-#pragma define_template CC_TPtrSlist<kv_pair<CC_String, FontList> >
-#pragma define_template pointer_vector<CC_TPtrSlist<kv_pair<CC_String, FontList> > >
-#pragma define_template CC_TValSlist<connective_t>
-#pragma define_template CC_TValSlistIterator<UAS_String>
-#pragma define_template CC_TValSlistIterator<connective_t>
-#pragma define_template CC_TValSlistIterator<TableDefn*>
-#pragma define_template CC_TValSlistIterator<TGDefn*>
-#pragma define_template CC_TValSlistIterator<PartialElementFeatures*>
-#pragma define_template CC_TValSlistIterator<_dtCvSegment*>
-#pragma define_template CC_TValSlistIterator<char*>
-
-#pragma define_template DictIter<UAS_String, int>
-
-//  The following are initializations for a static member 
-//  function that the DEC compiler wouldn't let me initialize
-//  in the template definition
-
-CC_Boolean kv_pair<CC_String, FontList>::f_needRemove = FALSE; 
-CC_Boolean kv_pair<FontEntry, char>::f_needRemove = FALSE; 
-
-#endif

cde/programs/dtinfo/dtinfo/src/Templates3.C

@@ -129,86 +129,3 @@ class RowDefn;
 #include "Dt/CanvasSegP.h"
 
 #include "Prelude.h"
-
-
-#ifdef __osf__
-
-// new templates
-
-#pragma define_template UAS_List<UAS_String>
-#pragma define_template UAS_List<UAS_SearchResultsEntry>
-
-#pragma define_template UAS_ObjList<int>
-
-#pragma define_template UAS_Pointer<UAS_TextRun>
-#pragma define_template UAS_Pointer<UAS_List<UAS_TextRun> >
-#pragma define_template UAS_Pointer<UAS_List<UAS_SearchResultsEntry> >
-#pragma define_template UAS_Pointer<UAS_List<UAS_TextRun> >
-
-//  UAS_PtrList
-#pragma define_template UAS_PtrList<UAS_BookcaseEntry>
-
-//  UAS_PtrList<UAS_Receiver...
-#pragma define_template UAS_PtrList<UAS_Receiver<CancelOperation> >
-#pragma define_template UAS_PtrList<UAS_Receiver<SelectionChanged> >
-#pragma define_template UAS_PtrList<UAS_Receiver<DisplayGraphic> >
-#pragma define_template UAS_PtrList<UAS_Receiver<MarkSelectionChanged> >
-
-//  UAS_PtrList<UAS_Sender...
-#pragma define_template UAS_PtrList<UAS_Sender<MarkChanged> >
-#pragma define_template UAS_PtrList<UAS_Sender<UAS_LibraryDestroyedMsg> >
-#pragma define_template UAS_PtrList<UAS_Sender<ViewMark> >
-#pragma define_template UAS_PtrList<UAS_Sender<MarkDeleted> >
-#pragma define_template UAS_PtrList<UAS_Sender<DetachGraphic> >
-#pragma define_template UAS_PtrList<UAS_Sender<ReAttachGraphic> >
-#pragma define_template UAS_PtrList<UAS_Sender<SelectionChanged> >
-#pragma define_template UAS_PtrList<UAS_Sender<MarkCreated> >
-#pragma define_template UAS_PtrList<UAS_Sender<MarkSelectionChanged> >
-#pragma define_template UAS_PtrList<UAS_Sender<UAS_DocumentRetrievedMsg> >
-#pragma define_template UAS_PtrList<UAS_Sender<ScopeCreated> >
-#pragma define_template UAS_PtrList<UAS_Sender<ScopeDeleted> >
-
-//  UAS_Receiver
-#pragma define_template UAS_Receiver<MarkDeleted>
-#pragma define_template UAS_Receiver<ScopeDeleted>
-#pragma define_template UAS_Receiver<EditMark>
-#pragma define_template UAS_Receiver<MarkMoved>
-#pragma define_template UAS_Receiver<ViewMark>
-#pragma define_template UAS_Receiver<MarkChanged>
-#pragma define_template UAS_Receiver<MarkCreated>
-#pragma define_template UAS_Receiver<MarkSelectionChanged>
-#pragma define_template UAS_Receiver<UAS_ErrorMsg>
-#pragma define_template UAS_Receiver<UAS_StatusMsg>
-#pragma define_template UAS_Receiver<ScopeCreated>
-#pragma define_template UAS_Receiver<ScopeRenamed>
-
-
-#pragma define_template CC_TPtrSlist<sr_DtCvSegment>
-#pragma define_template Stack<UAS_String>
-
-//  UAS_Sender
-#pragma define_template UAS_Sender<UAS_CancelRetrievalMsg>
-#pragma define_template UAS_Sender<UAS_ErrorMsg>
-#pragma define_template UAS_Sender<DisplayGraphic>
-#pragma define_template UAS_Sender<UAS_LibraryDestroyedMsg>
-
-//  UAS_PtrList<UAS_Receiver...
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_ErrorMsg> >
-#pragma define_template UAS_PtrList<UAS_Receiver<WantInputReady> >
-#pragma define_template UAS_PtrList<UAS_Receiver<WantInputReadyCancel> >
-#pragma define_template UAS_PtrList<UAS_Receiver<UAS_CancelRetrievalMsg> >
-#pragma define_template UAS_PtrList<UAS_Receiver<MarkCreated> >
-#pragma define_template UAS_PtrList<UAS_Receiver<MarkMoved> >
-#pragma define_template UAS_PtrList<UAS_Receiver<HistoryAdd> >
-#pragma define_template UAS_PtrList<UAS_Receiver<HistoryDelete> >
-#pragma define_template UAS_PtrList<UAS_Receiver<InputReady> >
-
-//  UAS_PtrList<UAS_Sender...
-#pragma define_template UAS_PtrList<UAS_Sender<WantInputReady> >
-#pragma define_template UAS_PtrList<UAS_Sender<WantInputReadyCancel> >
-#pragma define_template UAS_PtrList<UAS_Sender<HistoryDelete> >
-#pragma define_template UAS_PtrList<UAS_Sender<MarkMoved> >
-#pragma define_template UAS_PtrList<UAS_Sender<UAS_ErrorMsg> >
-#pragma define_template UAS_PtrList<UAS_Sender<HistoryAdd> >
-
-#endif

cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh

@@ -32,7 +32,7 @@ class UAS_Base: public Destructable {
 	UAS_Base ();
 	virtual ~UAS_Base ();
 	int operator == (const UAS_Base &);
-#if (defined(sparc) && defined(SC3)) || defined(__osf__) || defined(linux)
+#if (defined(sparc) && defined(SC3)) || defined(linux)
 	/* SC++ 4.0.1 does not like these being protected  */
 #else
     protected:

cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Sender.hh

@@ -36,17 +36,6 @@
 #endif
 #endif
 
-#if defined(__osf__)
-#if defined(CONCAT)
-#undef CONCAT
-#define CONCAT(A,B) A##B
-#endif
-#if defined(CONCAT3)
-#undef CONCAT3
-#define CONCAT3(A,B,C) A##B##C
-#endif
-#endif
-
 template <class T> class UAS_Receiver;
 
 template <class T>

cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh

@@ -66,7 +66,7 @@ class DtSR_BookcaseSearchEntry : public DtSR_BookcaseEntry
     UAS_Pointer<UAS_Common> bcase() { return uas_bcase; }
 
 
-#if !defined(SC3) && !defined(__osf__) && !defined(linux)
+#if !defined(SC3) && !defined(linux)
 
   protected:
     template <class T> friend class UAS_Pointer;

cde/programs/dtinfo/dtinfo/src/config.h

@@ -109,7 +109,7 @@ typedef unsigned char  u_char;
 #define self	*this
 
 #ifndef STRINGIFY
-#if defined(__STDC__) || defined(hpux) || defined(__osf__)
+#if defined(__STDC__) || defined(hpux)
 #define STRINGIFY(S) #S
 #else
 #define STRINGIFY(S) "S"
@@ -117,7 +117,7 @@ typedef unsigned char  u_char;
 #endif
 
 #ifndef CONCAT
-#if defined(__STDC__) || defined(hpux) || defined(__osf__)
+#if defined(__STDC__) || defined(hpux)
 #define CONCAT(A,B) A##B
 #define CONCAT3(A,B,C) A##B##C
 #else

cde/programs/dtinfo/dtinfo/src/main.C

@@ -67,12 +67,6 @@
 #include <fcntl.h>
 #endif
 
-#ifdef __osf__
-/* Suppress unaligned access message */
-#include <sys/types.h>
-#include <sys/sysinfo.h>
-#endif /* __osf__ */
-
 #define C_WindowSystem
 #define L_Other
 
@@ -253,27 +247,6 @@ main(int argc, char **argv)
 #ifdef MONITOR
     monitor(0);
 #endif
-
-#ifdef __osf__
-/* Code to suppress unaligned access message. */
-   unsigned long        op;
-   int                  buffer[2];
-   unsigned long        nbytes = 1;
-   char*                arg = 0;
-   unsigned long        flag = 0;
-
-   int                  ssi_status;
-
-   op = SSI_NVPAIRS;
-
-   buffer[0] = SSIN_UACPROC;
-   buffer[1] =  0x00000001;
-#ifdef DEBUG_UAC
-   buffer[1] |= 0x00000004;
-#endif
-
-   ssi_status = setsysinfo ( op, (caddr_t) buffer, nbytes, arg, flag );
-#endif
     
     WindowSystem window_system (argc, argv);
     CatMgr msg_catalog_mgr;

cde/programs/dtinfo/dtinfo/wwl/include/WWL/WObject.h

@@ -50,11 +50,7 @@
 
 class WObject {
 
-#ifdef __osf__
-  public:
-#else
   protected :
-#endif
 	Widget	widget;
 public :
 inline          WObject () { widget = NULL; }