From 25a730ed8825dabbef7c54f25cfbc318f87c5e26 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 10 Oct 2000 19:37:40 +0000
Subject: [PATCH] avoid problems with the borland compiler

---
 src/libCom/cxxTemplates/resourceLib.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/libCom/cxxTemplates/resourceLib.h b/src/libCom/cxxTemplates/resourceLib.h
index 460695931..e65c41bba 100644
--- a/src/libCom/cxxTemplates/resourceLib.h
+++ b/src/libCom/cxxTemplates/resourceLib.h
@@ -226,7 +226,7 @@ private:
 #if defined(__GNUC__) && ( __GNUC__<2 || (__GNUC__==2 && __GNUC__<8) )
 template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
 #else
-template <class T, unsigned MIN_INDEX_WIDTH=4, unsigned MAX_ID_WIDTH = sizeof(T)*CHAR_BIT>
+template <class T, unsigned MIN_INDEX_WIDTH=4u, unsigned MAX_ID_WIDTH = sizeof(T)*CHAR_BIT>
 #endif
 class intId {
 public:
@@ -250,11 +250,8 @@ protected:
 // 
 // NOTE: ITEM must public inherit from chronIntIdRes <ITEM>
 //
-#if defined(__GNUC__) && ( __GNUC__<2 || (__GNUC__==2 && __GNUC__<8) )
-typedef intId<unsigned, 8, sizeof(unsigned)*CHAR_BIT> chronIntId;
-#else
-typedef intId<unsigned, 8> chronIntId;
-#endif
+typedef intId<unsigned, 8u, sizeof(unsigned)*CHAR_BIT> chronIntId;
+
 template <class ITEM>
 class chronIntIdResTable : public resTable<ITEM, chronIntId> {
 public: