Index: opendiameter-cplusplus/libpana/src/pana_client_fsm.cxx
===================================================================
--- opendiameter-cplusplus.orig/libpana/src/pana_client_fsm.cxx
+++ opendiameter-cplusplus/libpana/src/pana_client_fsm.cxx
@@ -1039,7 +1039,7 @@ PANA_PacSession::PANA_PacSession(PANA_No
 
    // Listen to a PaC specific port - some pseudo random value
    sprintf(strAddr, "%s:%d", PANA_CFG_GENERAL().m_ListenAddress.data(),
-           (u_short)(PANA_CFG_GENERAL().m_ListenPort + ((int)this / 1000)));
+           (u_short)(PANA_CFG_GENERAL().m_ListenPort + ((uintptr_t)this / 1000)));
    m_PaC.PacAddress().string_to_addr(strAddr);
    m_PacChannel.Open(m_PaC.PacAddress());
    m_PacChannel.RegisterHandler(msgHandler);
Index: opendiameter-cplusplus/include/aaa_parser_api.h
===================================================================
--- opendiameter-cplusplus.orig/include/aaa_parser_api.h
+++ opendiameter-cplusplus/include/aaa_parser_api.h
@@ -512,7 +512,7 @@ class AAAAvpType
         * \param size AVP data size
         * \param containerEntryCreator entry creator object
         */
-        AAAAvpType(char* name,
+        AAAAvpType(const char* name,
                    AAAAvpDataType type,
                    ACE_UINT32 size,
                    AAAAvpContainerEntryFunctor creator) :
@@ -525,7 +525,7 @@ class AAAAvpType
         /*!
         *  This function is used for obtaining the AVP type name.
         */
-        char* getName(void) {
+        const char* getName(void) {
             return name;
         }
 
@@ -551,7 +551,7 @@ class AAAAvpType
         }
 
     private:
-        char *           name;  /**< name of the avp type */
+        const char *     name;  /**< name of the avp type */
         AAAAvpDataType   type;  /**< enumerate type */
         ACE_UINT32       size;  /**< minimum size of this avp payload (0 means variable size) */
         AAAAvpContainerEntryFunctor containerEntryCreator; /**< Container entry creator */
@@ -705,10 +705,10 @@ class AAAAvpContainerMngr
 template<typename D, AAAAvpDataType t, typename EM>
 class AAAAvpWidget {
     public:
-        AAAAvpWidget(char *name) {
+        AAAAvpWidget(const char *name) {
             AllocContainer(name);
         }
-        AAAAvpWidget(char *name, D &value) {
+        AAAAvpWidget(const char *name, D &value) {
             AllocContainer(name);
             Get() = value;
         }
@@ -735,7 +735,7 @@ class AAAAvpWidget {
         }
 
     protected:
-        void AllocContainer(char *name) {
+        void AllocContainer(const char *name) {
             m_refCount = 0;
             AAAAvpContainerMngr cm;
             m_cAvp = cm.acquire(name);
@@ -771,7 +771,7 @@ class AAAAvpContainerWidget
        AAAAvpContainerWidget(AAAAvpContainerList &lst) :
            list(lst) {
        }
-       D *GetAvp(char *name, unsigned int index=0) {
+       D *GetAvp(const char *name, unsigned int index=0) {
           AAAAvpContainer* c = list.search(name);
           if (c && (index < c->size())) {
               AAAAvpContainerEntry *e = (*c)[index];
@@ -779,7 +779,7 @@ class AAAAvpContainerWidget
           }
           return (0);
        }
-       D &AddAvp(char *name, bool append = false) {
+       D &AddAvp(const char *name, bool append = false) {
           AAAAvpContainer* c = list.search(name);
           if (! c) {
               AAAAvpWidget<D, t, EM> avpWidget(name);
@@ -797,7 +797,7 @@ class AAAAvpContainerWidget
        void AddAvp(AAAAvpContainerWidget<D, t, EM> &avp) {
            list.add(avp());
        }
-       void DelAvp(char *name) {
+       void DelAvp(const char *name) {
           std::list<AAAAvpContainer*>::iterator i;
           for (i=list.begin(); i!=list.end();i++) {
               AAAAvpContainer *c = *i;
@@ -809,7 +809,7 @@ class AAAAvpContainerWidget
               }
           }
        }
-       unsigned int GetAvpCount(char *name) {
+       unsigned int GetAvpCount(const char *name) {
           AAAAvpContainer* c = list.search(name);
           return (c) ? c->size() : 0;
        }
Index: opendiameter-cplusplus/libodutl/include/od_utl_xml_sax_parser.h
===================================================================
--- opendiameter-cplusplus.orig/libodutl/include/od_utl_xml_sax_parser.h
+++ opendiameter-cplusplus/libodutl/include/od_utl_xml_sax_parser.h
@@ -48,7 +48,7 @@ class OD_UTL_EXPORT OD_Utl_XML_SaxExcept
       OD_Utl_XML_SaxException() :
          m_Code(0) {
       }
-      OD_Utl_XML_SaxException(char *desc, 
+      OD_Utl_XML_SaxException(const char *desc,
                               ACE_UINT32 code = 0) :
          m_Code(code),
          m_description(desc) {
@@ -81,7 +81,7 @@ typedef std::list<OD_Utl_XML_Element*> O
 class OD_UTL_EXPORT OD_Utl_XML_Element
 {
   public:
-     OD_Utl_XML_Element(char *name, 
+     OD_Utl_XML_Element(const char *name,
                         OD_Utl_XML_ElementStack &stack) :
         m_inProcess(false), 
         m_name(name),
@@ -168,7 +168,7 @@ class OD_UTL_EXPORT OD_Utl_XML_SaxParser
       OD_Utl_XML_ElementMap &elementMap() {
       	  return m_elementMap;
       }
-      virtual void Load(char* xmlFile);
+      virtual void Load(const char* xmlFile);
 
       virtual void characters(const ACEXML_Char *ch,
                               int start,
@@ -196,7 +196,7 @@ class OD_Utl_XML_RegisteredElement :
 {
   public:
      OD_Utl_XML_RegisteredElement(T &arg,
-                                  char *name, 
+                                  const char *name,
                                   OD_Utl_XML_SaxParser &parser) :
         OD_Utl_XML_Element(name, parser.callStack()),
         m_arg(arg) {
Index: opendiameter-cplusplus/include/framework.h
===================================================================
--- opendiameter-cplusplus.orig/include/framework.h
+++ opendiameter-cplusplus/include/framework.h
@@ -152,7 +152,7 @@ class AAA_Job
 
  public:
   /// Constructor.
-  AAA_Job(AAA_JobData *d=0, char* name=0) : data(d), priority(1), weight(1)
+  AAA_Job(AAA_JobData *d=0, const char* name=0) : data(d), priority(1), weight(1)
   {
     if (name) this->name = std::string(name);
     refcount = 1;
@@ -288,7 +288,7 @@ template <class T, class LOCK = ACE_Thre
 {
  public:
   /// Constructor. 
-  AAA_QueueJob(AAA_JobData *d=0, char* name=0, 
+  AAA_QueueJob(AAA_JobData *d=0, const char* name=0,
 	       unsigned numPriority=1, unsigned maxWeight=1) throw (int)
  : AAA_Job(d, name), 
  numPriority(numPriority), maxWeight(maxWeight), total(0),
@@ -642,7 +642,7 @@ class AAA_GroupedJob : public AAA_QueueJ
   /// Default constructor is prohibited.
   static AAA_GroupedJob* 
     Create(AAA_Job &parent, AAA_JobData* d, 
-	   char *name=0, 
+	   const char *name=0,
 	   AAA_SchedulingPolicy policy=AAA_SCHED_FIFO,
 	   bool blocking=false,
 	   unsigned numPriority=1, unsigned maxWeight=1) throw(AAA_Error)
@@ -657,7 +657,7 @@ class AAA_GroupedJob : public AAA_QueueJ
   }
 
   static AAA_GroupedJob* 
-    Create(AAA_JobData* d, char *name=0, 
+    Create(AAA_JobData* d, const char *name=0,
 	   AAA_SchedulingPolicy policy=AAA_SCHED_FIFO,
 	   bool blocking=false,
 	   unsigned numPriority=1, unsigned maxWeight=1) throw(AAA_Error)
@@ -764,7 +764,7 @@ class AAA_GroupedJob : public AAA_QueueJ
   /// Constructor for non-root job.
    AAA_GroupedJob(AAA_Job &parent, 
 		  AAA_JobData* d, 
-		  char *name=0,
+		  const char *name=0,
   		  AAA_SchedulingPolicy policy=AAA_SCHED_FIFO,
 		  bool blocking=false, 
 		  unsigned numPriority=1, unsigned maxWeight=1)
@@ -777,7 +777,7 @@ class AAA_GroupedJob : public AAA_QueueJ
   }
 
   /// Constructor for root job.
-  AAA_GroupedJob(AAA_JobData* d, char *name=0,
+  AAA_GroupedJob(AAA_JobData* d, const char *name=0,
 		 AAA_SchedulingPolicy policy=AAA_SCHED_FIFO, 
 		 bool blocking=false,
 		 unsigned numPriority=1, unsigned maxWeight=1)
@@ -852,7 +852,7 @@ public:
   /// AAA_SCHED_WFQ and AAA_SCHED_PRIORITY.  The task name will be
   /// used for logging purpose.  The number of priority classes and
   /// the maximum weight value can also be specified.
-  AAA_Task(AAA_SchedulingPolicy policy=AAA_SCHED_FIFO, char *name=0,
+  AAA_Task(AAA_SchedulingPolicy policy=AAA_SCHED_FIFO, const char *name=0,
 	   unsigned numPriority=1, unsigned maxWeight=1) 
     : handle
     (AAA_JobHandle<AAA_GroupedJob>
@@ -1238,7 +1238,7 @@ public:
   std::string& Name() { return name; }
 
 protected:
-  AAA_StateMachineBase(char *name=0) 
+  AAA_StateMachineBase(const char *name=0)
   {
     if (name)
       this->name = std::string(name);
@@ -1310,7 +1310,7 @@ public:
   }
 
 protected:
-  AAA_StateMachine(ARG &arg, AAA_StateTable<ARG> &table, char *name=0)
+  AAA_StateMachine(ARG &arg, AAA_StateTable<ARG> &table, const char *name=0)
     : AAA_StateMachineBase(name),
     stateTable(table), actionArg(arg), running(false)
   {}
@@ -1440,7 +1440,7 @@ public:
   /// Constructor.  ACE_Reactor maintains the timer queue and is bound
   /// to a specific thread.
   AAA_StateMachineWithTimer(ARG &arg, AAA_StateTable<ARG> &table, 
-			    ACE_Reactor &r, char *name=0)
+			    ACE_Reactor &r, const char *name=0)
       : AAA_StateMachine<ARG>(arg, table, name), reactor(r),
         timerEventHandler(*this)        
   {}
@@ -1647,9 +1647,9 @@ class AAA_ProtectedPtrMap
 class AAA_RangedValue
 {
    public:
-      typedef enum {
+      enum {
           DEFAULT_LOW  = 0,
-          DEFAULT_HIGH = 3,
+          DEFAULT_HIGH = 3
       };
 
    public:
Index: opendiameter-cplusplus/include/aaa_dictionary_api.h
===================================================================
--- opendiameter-cplusplus.orig/include/aaa_dictionary_api.h
+++ opendiameter-cplusplus/include/aaa_dictionary_api.h
@@ -51,8 +51,7 @@ typedef struct
   ACE_UINT16 max;
 } AAARangeQualifier;
 
-typedef enum
-{
+enum {
   AAA_QUALIFIER_INFINITY = 65535, /* 2^16 -1 */
 
 };
Index: opendiameter-cplusplus/libeap/include/eap_fsm.hxx
===================================================================
--- opendiameter-cplusplus.orig/libeap/include/eap_fsm.hxx
+++ opendiameter-cplusplus/libeap/include/eap_fsm.hxx
@@ -119,7 +119,7 @@ class EapStateMachine : 
  public:
   /// Constructor.
   EapStateMachine(ARG& arg, AAA_StateTable<ARG> &table, ACE_Reactor &r, 
-		  EapJobMultiplexor &mux, char *name=0)
+		  EapJobMultiplexor &mux, const char *name=0)
     : AAA_StateMachineWithTimer<ARG>(arg, table, r, name),
       mux(mux)
   {}
Index: opendiameter-cplusplus/libpana/include/pana_message.h
===================================================================
--- opendiameter-cplusplus.orig/libpana/include/pana_message.h
+++ opendiameter-cplusplus/libpana/include/pana_message.h
@@ -277,7 +277,7 @@ class PANA_MsgHeader
        } Flags;
 
        // Default header length definition
-       typedef enum {
+       enum {
           HeaderLength = 16 // length in octet
        };
 
Index: opendiameter-cplusplus/libpana/include/pana_paa_factory.h
===================================================================
--- opendiameter-cplusplus.orig/libpana/include/pana_paa_factory.h
+++ opendiameter-cplusplus/libpana/include/pana_paa_factory.h
@@ -56,7 +56,7 @@ class PANA_EXPORT PANA_PaaSessionFactory
    public PANA_PaaSessionChannel
 {
    public:
-      typedef enum {
+      enum {
           MAX_MINUTES_TO_HONOR_SID = 3,
       };
 
Index: opendiameter-cplusplus/libpana/include/pana_parser.h
===================================================================
--- opendiameter-cplusplus.orig/libpana/include/pana_parser.h
+++ opendiameter-cplusplus/libpana/include/pana_parser.h
@@ -98,7 +98,7 @@ class PANA_AvpType :
     public AAAAvpType
 {
     public:
-        PANA_AvpType(char* name,
+        PANA_AvpType(const char* name,
                      AAAAvpDataType type,
                      ACE_UINT32 size,
                      PANA_AvpValueParserFunctor parserCreator,
@@ -397,10 +397,10 @@ class PANA_AvpWidget :
     public AAAAvpWidget<D, t, PANA_AvpContainerEntryManager>
 {
     public:
-        PANA_AvpWidget(char *name) :
+        PANA_AvpWidget(const char *name) :
             AAAAvpWidget<D, t, PANA_AvpContainerEntryManager>(name) {
         }
-        PANA_AvpWidget(char *name, D &value) :
+        PANA_AvpWidget(const char *name, D &value) :
             AAAAvpWidget<D, t, PANA_AvpContainerEntryManager>(name, value) {
         }
         PANA_AvpWidget(AAAAvpContainer *avp) :
Index: opendiameter-cplusplus/libpana/src/pana_parser_dict.cxx
===================================================================
--- opendiameter-cplusplus.orig/libpana/src/pana_parser_dict.cxx
+++ opendiameter-cplusplus/libpana/src/pana_parser_dict.cxx
@@ -51,7 +51,7 @@ typedef std::list<PANAXML_Element*> PANA
 class PANAXML_Element
 {
   public:
-     PANAXML_Element(char *name,
+     PANAXML_Element(const char *name,
                     PANAXML_ElementStack &stack) :
         m_inProcess(false),
         m_isSkipped(false),
@@ -454,7 +454,7 @@ class PANAXML_PositionElement :
   public PANAXML_Element
 {
   public:
-     PANAXML_PositionElement(char *name,
+     PANAXML_PositionElement(const char *name,
                             PANAXML_ElementStack &stack) :
         PANAXML_Element(name, stack),
         m_qAvpList(NULL) {
@@ -637,7 +637,7 @@ typedef std::pair<std::string, PANAXML_E
 class PANAXML_ParsingTables
 {
   public:
-     typedef enum {
+     enum {
          NUM_PARSING_PASSES = 2,
      };
 
Index: opendiameter-cplusplus/libpana/test/Test2.cxx
===================================================================
--- opendiameter-cplusplus.orig/libpana/test/Test2.cxx
+++ opendiameter-cplusplus/libpana/test/Test2.cxx
@@ -574,7 +574,6 @@ class StandAloneAuthAppFactory : public 
 
 #if defined (ACE_HAS_SIG_C_FUNC)
 extern "C" {
-#endif
 static void MySigHandler(int signo)
 {
   if (gPacReference) {
@@ -589,7 +588,6 @@ static void MySigHandler(int signo)
       std::cout << "Signal has been received but reference is not yet ready" << std::endl;
   }
 }
-#if defined (ACE_HAS_SIG_C_FUNC)
 }
 #endif
 
Index: opendiameter-cplusplus/libdiamparser/include/aaa_parser_avpvalue.h
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/include/aaa_parser_avpvalue.h
+++ opendiameter-cplusplus/libdiamparser/include/aaa_parser_avpvalue.h
@@ -46,10 +46,24 @@
 #include "aaa_parser_q_avplist.h"
 #include "aaa_q_avplist.h"
 #include "aaa_g_avplist.h"
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+#if !defined(BOOST_SPIRIT_USE_OLD_NAMESPACE)
+#define BOOST_SPIRIT_USE_OLD_NAMESPACE
+#endif
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_loops.hpp>
+#include <boost/spirit/include/classic_for.hpp>
+#else
 #include <boost/spirit/core.hpp>
 #include <boost/spirit/utility/loops.hpp>
 #include <boost/spirit/dynamic/for.hpp>
+#endif
+
 #include <boost/pool/detail/mutex.hpp>
+
 using namespace boost::spirit;
 
 /// Container entry type definitions.
Index: opendiameter-cplusplus/libdiamparser/src/aaa_xml_parsing.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/src/aaa_xml_parsing.cxx
+++ opendiameter-cplusplus/libdiamparser/src/aaa_xml_parsing.cxx
@@ -49,7 +49,7 @@ typedef std::list<AAAXML_Element*> AAAXM
 class AAAXML_Element
 {
   public:
-     AAAXML_Element(char *name, 
+     AAAXML_Element(const char *name,
                     AAAXML_ElementStack &stack) :
         m_inProcess(false), 
         m_isSkipped(false),
@@ -607,7 +607,7 @@ class AAAXML_PositionElement : 
   public AAAXML_Element
 {
   public:
-     AAAXML_PositionElement(char *name, 
+     AAAXML_PositionElement(const char *name,
                             AAAXML_ElementStack &stack) :
         AAAXML_Element(name, stack),
         m_qAvpList(NULL) {
@@ -790,7 +790,7 @@ typedef std::pair<std::string, AAAXML_El
 class AAAXML_ParsingTables
 {
   public:
-     typedef enum {
+     enum {
          NUM_PARSING_PASSES = 2,
      };
 
@@ -1047,7 +1047,7 @@ class AAAXML_SAXHandler : public ACEXML_
 };
 
 void
-parseXMLDictionary(char* xmlFile)
+parseXMLDictionary(const char* xmlFile)
 {
    ACEXML_FileCharStream *fstm = NULL;
    try {
Index: opendiameter-cplusplus/libdiamparser/include/aaa_memory_manager.h
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/include/aaa_memory_manager.h
+++ opendiameter-cplusplus/libdiamparser/include/aaa_memory_manager.h
@@ -67,7 +67,7 @@ class DiameterMsgManager
         /*!
          * Definitions for default block count
          */
-        typedef enum {
+        enum {
 	   AAA_MIN_MESSAGE_COUNT = 512
         };
 
Index: opendiameter-cplusplus/libdiamparser/include/diameter_parser.h
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/include/diameter_parser.h
+++ opendiameter-cplusplus/libdiamparser/include/diameter_parser.h
@@ -195,9 +195,9 @@ typedef struct {
     public:
         std::string    fqdn;
         ACE_UINT16     port;
-        AAAInt8        transport:2;
-        AAAInt8        protocol:2;
-        AAAInt8        scheme:2;
+        AAAUInt8       transport:2;
+        AAAUInt8       protocol:2;
+        AAAUInt8       scheme:2;
 } diameter_uri_t;
 
 typedef struct
@@ -366,7 +366,7 @@ class AAA_PARSER_EXPORT DiameterDictiona
         *
         * \param dictFile XML based Dictionary File
         */
-        void init(char *dictFile);
+        void init(const char *dictFile);
 
         /*!
         * Used for translating the command name into a pair of Command
@@ -376,7 +376,7 @@ class AAA_PARSER_EXPORT DiameterDictiona
         * \param commandCode Command Code
         * \param appId Application Identifier
         */
-        bool getCommandCode(char *commandName,
+        bool getCommandCode(const char *commandName,
                             AAACommandCode *commandCode,
                             DiameterApplicationId *appId);
 
@@ -807,7 +807,7 @@ class DiameterAvpType :
         * \param parserCreator parser creator object
         * \param containerEntryCreator entry creator object
         */
-        DiameterAvpType(char* name,
+        DiameterAvpType(const char* name,
                         AAAAvpDataType type,
                         ACE_UINT32 size,
                         DiameterAvpValueParserFunctor parserCreator,
@@ -1046,10 +1046,10 @@ class DiameterAvpWidget :
     public AAAAvpWidget<D, t, DiameterAvpContainerEntryManager>
 {
     public:
-        DiameterAvpWidget(char *name) :
+        DiameterAvpWidget(const char *name) :
             AAAAvpWidget<D, t, DiameterAvpContainerEntryManager>(name) {
         }
-        DiameterAvpWidget(char *name, D &value) :
+        DiameterAvpWidget(const char *name, D &value) :
             AAAAvpWidget<D, t, DiameterAvpContainerEntryManager>(name, value) {
         }
         DiameterAvpWidget(AAAAvpContainer *avp) :
Index: opendiameter-cplusplus/libdiamparser/include/aaa_msg_to_xml.h
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/include/aaa_msg_to_xml.h
+++ opendiameter-cplusplus/libdiamparser/include/aaa_msg_to_xml.h
@@ -41,7 +41,7 @@
 class AAA_PARSER_EXPORT_ONLY AAAXmlElement
 {
    public:
-      AAAXmlElement(char *name) :
+      AAAXmlElement(const char *name) :
           m_name(name) {
       }
       void SetText(const char *text);
Index: opendiameter-cplusplus/libdiamparser/test/aaa_test1.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/test/aaa_test1.cxx
+++ opendiameter-cplusplus/libdiamparser/test/aaa_test1.cxx
@@ -478,7 +478,7 @@ stest_nas_request(unsigned char *buf, in
   AAAAvpContainer *c_dhost = cm.acquire("Destination-Host");
   AAAAvpContainer *c_uri = cm.acquire("Example-URI");
   AAAAvpContainer *c_rule = cm.acquire("Example-IPFilterRule");
-  diameter_hdr_flag flag = {1,1,0};
+  diameter_hdr_flag flag = {1,1,0,0,0};
   DiameterMsgHeader h(1, 0, flag, 9999999, 0, 1, 10);
   DiameterMsg msg;
   AAAAvpContainerEntry *e;
Index: opendiameter-cplusplus/libdiamparser/include/aaa_xml_parsing.h
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/include/aaa_xml_parsing.h
+++ opendiameter-cplusplus/libdiamparser/include/aaa_xml_parsing.h
@@ -37,7 +37,7 @@
 #ifndef __XML_PARSING_H__
 #define __XML_PARSING_H__
 
-void parseXMLDictionary(char*);
+void parseXMLDictionary(const char*);
 
 #endif // __XMLDICT_H__
 
Index: opendiameter-cplusplus/libdiamparser/src/aaa_dict_mngr.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/src/aaa_dict_mngr.cxx
+++ opendiameter-cplusplus/libdiamparser/src/aaa_dict_mngr.cxx
@@ -37,7 +37,7 @@
 #include "aaa_xml_parsing.h"
 #include "aaa_parser_avpvalue.h"
 
-bool DiameterDictionaryManager::getCommandCode(char *commandName,
+bool DiameterDictionaryManager::getCommandCode(const char *commandName,
                                                AAACommandCode *commandCode,
                                                DiameterApplicationId *appId)
 {
@@ -51,7 +51,7 @@ bool DiameterDictionaryManager::getComma
     return true;
 }
 
-void DiameterDictionaryManager::init(char *dictFile)
+void DiameterDictionaryManager::init(const char *dictFile)
 {
     // Parser the XML dictionary.
     parseXMLDictionary(dictFile);
Index: opendiameter-cplusplus/libdiamparser/test/aaa_test2.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/test/aaa_test2.cxx
+++ opendiameter-cplusplus/libdiamparser/test/aaa_test2.cxx
@@ -301,7 +301,7 @@ stest(unsigned char *buf, int size)
   AAAAvpContainer *c_orstatid = cm.acquire("Origin-State-Id");
   AAAAvpContainerEntry *e;
 
-  diameter_hdr_flag flag = {1,0,0,1};
+  diameter_hdr_flag flag = {1,0,0,1,0};
   DiameterMsgHeader h(1, 0, flag, 257, 0, 1, 10);
 
   DiameterMsg msg;
@@ -425,7 +425,7 @@ mstest(unsigned char *buf, int size)
   AAAAvpContainer *c_rrec = cm.acquire("Route-Record");
   AAAAvpContainerEntry *e;
 
-  diameter_hdr_flag flag = {1,0,0,1};
+  diameter_hdr_flag flag = {1,0,0,1,0};
   DiameterMsgHeader h(1, 0, flag, 9999999, 0, 1, 10);
 
   DiameterMsg msg;
Index: opendiameter-cplusplus/libdiamparser/test/aaa_test3.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiamparser/test/aaa_test3.cxx
+++ opendiameter-cplusplus/libdiamparser/test/aaa_test3.cxx
@@ -306,7 +306,7 @@ stest(unsigned char *buf, int size)
   AAAAvpContainer *c_orstatid = cm.acquire("Origin-State-Id");
   AAAAvpContainerEntry *e;
 
-  diameter_hdr_flag flag = {1,0,0,1};
+  diameter_hdr_flag flag = {1,0,0,1,0};
   DiameterMsgHeader h(1, 0, flag, 257, 0, 1, 10);
 
   DiameterMsg msg;
Index: opendiameter-cplusplus/libdiameter/include/aaa_transport_interface.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_transport_interface.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_transport_interface.h
@@ -134,7 +134,7 @@ template<class TX_IF, class RX_HANDLER>
 class Diameter_IO : public Diameter_IO_Base
 {
    public:
-      typedef enum {
+      enum {
          MAX_PACKET_LENGTH = 1024,
          DEFAULT_TIMEOUT = 0, // msec
       };
@@ -229,7 +229,7 @@ template<class TX_IF, class RX_HANDLER>
 class Diameter_IO_Factory : public ACE_Task<ACE_MT_SYNCH>
 {
    public:
-      Diameter_IO_Factory(char *name = "") :
+      Diameter_IO_Factory(const char *name = "") :
           m_Perpetual(false),
           m_Active(false),
           m_Name(name) {
Index: opendiameter-cplusplus/libdiameter/include/aaa_route_framework.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_route_framework.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_route_framework.h
@@ -90,7 +90,7 @@ class DiameterRoutingNode
        }
    protected:
        DiameterRoutingNode(DiameterRoutingNode *next = NULL,
-                       char *name = "") :
+                           const char *name = "") :
            m_Next(next), m_Name(name) {
        }
        void Dump(AAA_ROUTE_RESULT r) {
@@ -219,7 +219,7 @@ class DiameterDeliveryRoutingNode : publ
    protected:
        DiameterDeliveryRoutingNode(ARG &a,
                                DiameterRoutingNode *next = NULL,
-                               char *name = "") :
+                               const char *name = "") :
            DiameterRoutingNode(next, name),
            m_Arg(a) {
        }
@@ -314,7 +314,7 @@ class DiameterRequestRoutingNode : publi
    protected:
        DiameterRequestRoutingNode(ARG &a,
                               DiameterRoutingNode *next = NULL,
-                              char *name = "") :
+                              const char *name = "") :
            DiameterRoutingNode(next, name),
            m_DeliveryNode(a) { }
        virtual ~DiameterRequestRoutingNode() {
Index: opendiameter-cplusplus/libdiameter/include/aaa_route_msg_router.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_route_msg_router.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_route_msg_router.h
@@ -39,7 +39,7 @@
 #include "ace/Singleton.h"
 #include "aaa_route_framework.h"
 
-typedef enum {
+enum {
    DIAMETER_ROUTER_RETX_DIVISOR = 2,
    DIAMETER_ROUTER_MIN_RETX_INTERVAL = 8,
    DIAMETER_ROUTER_MAX_RETX_COUNT    = 10
Index: opendiameter-cplusplus/libdiameter/include/aaa_peer_fsm.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_peer_fsm.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_peer_fsm.h
@@ -806,7 +806,7 @@ class DiameterPeerStateMachine :
    protected:
 
       void DumpPeerCapabilities();
-      void DumpEvent(AAA_Event ev, char *prefix) {
+      void DumpEvent(AAA_Event ev, const char *prefix) {
 #if AAA_FSM_EVENT_DEBUG
           static char *evStrTable[] = { "DIAMETER_PEER_EV_START",  
                                         "DIAMETER_PEER_EV_STOP",
Index: opendiameter-cplusplus/libdiameter/include/aaa_transport_ace.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_transport_ace.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_transport_ace.h
@@ -57,7 +57,7 @@ template<class ACE_ACCEPTOR,
 class Diameter_ACE_Transport : public DiameterTransportInterface<ACE_ADDRESS>
 {
    public:
-      typedef enum {
+      enum {
           ACCEPTOR_TIMEOUT = 10   // 10 sec
       };
 
Index: opendiameter-cplusplus/libdiameter/include/aaa_transport_collector.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_transport_collector.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_transport_collector.h
@@ -37,7 +37,7 @@
 #include "diameter_parser.h"
 #include "aaa_transport_interface.h"
 
-typedef enum {
+enum {
     MSG_COLLECTOR_MAX_MSG_LENGTH  = 2048,
     MSG_COLLECTOR_MAX_MSG_BLOCK   = 10
 };
Index: opendiameter-cplusplus/libdiameter/include/aaa_garbage_collector.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_garbage_collector.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_garbage_collector.h
@@ -39,7 +39,7 @@
 class DiameterGarbageCollectorAttribute
 {
     public:
-        typedef enum {
+        enum {
             DELETION_GRACEPERIOD = 100000, // usec
         };
 
Index: opendiameter-cplusplus/libdiameter/include/aaa_peer_interface.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_peer_interface.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_peer_interface.h
@@ -47,7 +47,7 @@ class DiameterPeerEventInterface
 {
    public:
       virtual void Connected() = 0;
-      virtual void Disconnected(int cause) = 0;
+      virtual void Disconnected(DIAMETER_DISCONNECT_CAUSE cause) = 0;
       virtual void Error(PFSM_EV_ERR err) = 0;
       virtual ~DiameterPeerEventInterface() {
       }
@@ -101,7 +101,7 @@ class DIAMETERBASEPROTOCOL_EXPORT Diamet
                    PEER_EVENT_CONN_NACK);
          }
       }
-      virtual void Disconnected(int cause) {
+      virtual void Disconnected(DIAMETER_DISCONNECT_CAUSE cause) {
 
          DIAMETER_MSG_ROUTER()->ReTransmitEvent
             (static_cast<DiameterPeerEntry*>(this));
Index: opendiameter-cplusplus/libdiameter/src/aaa_peer_fsm.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/src/aaa_peer_fsm.cxx
+++ opendiameter-cplusplus/libdiameter/src/aaa_peer_fsm.cxx
@@ -433,8 +433,7 @@ void DiameterPeerI_SendDPADisconnect::op
     diameter_unsigned32_t *uint32 = cause.GetAvp(DIAMETER_AVPNAME_DISCONNECT_CAUSE);
 
     fsm.Cleanup();
-    fsm.Disconnected
-         ((uint32) ? *uint32 : AAA_DISCONNECT_UNKNOWN);
+    fsm.Disconnected((uint32) ? (DIAMETER_DISCONNECT_CAUSE)*uint32 : AAA_DISCONNECT_UNKNOWN);
 }
 
 void DiameterPeerR_SendDPADisconnect::operator()(DiameterPeerStateMachine &fsm)
@@ -448,8 +447,7 @@ void DiameterPeerR_SendDPADisconnect::op
     diameter_unsigned32_t *uint32 = cause.GetAvp(DIAMETER_AVPNAME_DISCONNECT_CAUSE);
 
     fsm.Cleanup();
-    fsm.Disconnected
-         ((uint32) ? *uint32 : AAA_DISCONNECT_UNKNOWN);
+    fsm.Disconnected((uint32) ? (DIAMETER_DISCONNECT_CAUSE)*uint32 : AAA_DISCONNECT_UNKNOWN);
 }
 
 void DiameterPeer_Disconnect::operator()(DiameterPeerStateMachine &fsm)
@@ -685,7 +683,7 @@ void DiameterPeerStateMachine::Disassemb
        &authAppId,
        &acctAppId
    };
-   char *avpNames[] = {
+   const char *avpNames[] = {
        DIAMETER_AVPNAME_SUPPORTEDVENDORID,
        DIAMETER_AVPNAME_AUTHAPPID,
        DIAMETER_AVPNAME_ACCTAPPID
@@ -1224,9 +1222,9 @@ void DiameterPeerStateMachine::DumpPeerC
        &cap.m_AuthAppIdLst,
        &cap.m_AcctAppIdLst
    };
-   char *label[] = { "Supported Vendor Id",
-                     "Auth Application Id",
-                     "Acct Application Id" };
+   const char *label[] = { "Supported Vendor Id",
+                           "Auth Application Id",
+                           "Acct Application Id" };
    for (unsigned int i=0;
         i < sizeof(idList)/sizeof(DiameterApplicationIdLst*);
         i++) {
Index: opendiameter-cplusplus/libdiameter/test/test_agent.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/test/test_agent.cxx
+++ opendiameter-cplusplus/libdiameter/test/test_agent.cxx
@@ -233,7 +233,7 @@ class PeerEventHandler : 
       virtual void Connected() {
          AAA_LOG((LM_INFO, "(%P|%t) **** peer is now connected ****\n"));
       }
-      virtual void Disconnected(int cause) {
+      virtual void Disconnected(DIAMETER_DISCONNECT_CAUSE cause) {
          AAA_LOG((LM_INFO, "(%P|%t) **** peer is now disconnected: %d ****\n",
                  cause));
       }
Index: opendiameter-cplusplus/libdiameter/test/test_client1.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/test/test_client1.cxx
+++ opendiameter-cplusplus/libdiameter/test/test_client1.cxx
@@ -236,7 +236,7 @@ class PeerEventHandler :
       virtual void Connected() {
          AAA_LOG((LM_INFO, "(%P|%t) **** peer is now connected ****\n"));
       }
-      virtual void Disconnected(int cause) {
+      virtual void Disconnected(DIAMETER_DISCONNECT_CAUSE cause) {
          AAA_LOG((LM_INFO, "(%P|%t) **** peer is now disconnected: %d ****\n",
                  cause));
       }
@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
    task.Start(5);
 
    int msgCountPerSession = 3; //10000;
-   char *cfgFile = "config/nas1.local.xml";
+   const char *cfgFile = "config/nas1.local.xml";
 
    if (argc == 2) {
        cfgFile = argv[1];
Index: opendiameter-cplusplus/libdiameter/test/test_client2.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/test/test_client2.cxx
+++ opendiameter-cplusplus/libdiameter/test/test_client2.cxx
@@ -362,7 +362,7 @@ class PeerEventHandler : 
       virtual void Connected() {
          AAA_LOG((LM_INFO, "(%P|%t) **** peer is now connected ****\n"));
       }
-      virtual void Disconnected(int cause) {
+      virtual void Disconnected(DIAMETER_DISCONNECT_CAUSE cause) {
          AAA_LOG((LM_INFO, "(%P|%t) **** peer is now disconnected: %d ****\n",
                  cause));
       }
@@ -388,7 +388,7 @@ int main(int argc, char *argv[])
 
    int msgCountPerSession = 10;
    int sessionCount = 100;
-   char *cfgFile = "config/nas2.local.xml";
+   const char *cfgFile = "config/nas2.local.xml";
 
    if (argc == 2) {
        cfgFile = argv[1];
Index: opendiameter-cplusplus/libdiameter/src/aaa_session_attributes.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/src/aaa_session_attributes.cxx
+++ opendiameter-cplusplus/libdiameter/src/aaa_session_attributes.cxx
@@ -78,13 +78,13 @@ AAAReturnCode DiameterSessionId::Get(Dia
       if (sid == NULL) {
          throw (AAA_ERR_PARSING_FAILED);
       }
-      ACE_UINT32 where1 = sid->find(";");
+      size_t where1 = sid->find(";");
       if (where1 == std::string::npos) {
          throw (AAA_ERR_PARSING_FAILED);
       }
       DiameterId() = sid->substr(0, where1);
 
-      ACE_UINT32 where2 = sid->find(";", ++ where1);
+      size_t where2 = sid->find(";", ++ where1);
       if (where2 == std::string::npos) {
          throw (AAA_ERR_PARSING_FAILED);
       }
Index: opendiameter-cplusplus/libdiameter/src/aaa_xml_data.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/src/aaa_xml_data.cxx
+++ opendiameter-cplusplus/libdiameter/src/aaa_xml_data.cxx
@@ -182,7 +182,7 @@ class DiameterXmlRouteParser :
                OD_Utl_XML_ContentConvNull<diameter_unsigned32_t> > 
 {
   public:
-     DiameterXmlRouteParser(char *name, OD_Utl_XML_SaxParser &parser) :
+     DiameterXmlRouteParser(const char *name, OD_Utl_XML_SaxParser &parser) :
          OD_Utl_XML_RegisteredElement
               <diameter_unsigned32_t,
                OD_Utl_XML_ContentConvNull<diameter_unsigned32_t> > 
@@ -562,7 +562,7 @@ class DiameterXmlSessionTimeoutConv :
      }
 };
 
-void DiameterXMLConfigParser::Load(AAA_Task &task, char *cfgfile)
+void DiameterXMLConfigParser::Load(AAA_Task &task, const char *cfgfile)
 {
     DiameterDataRoot &root = *DIAMETER_CFG_ROOT();
 
@@ -749,9 +749,9 @@ void DiameterXMLConfigParser::dump()
     DiameterApplicationIdLst *idList[] = { &root.general.supportedVendorIdLst,
                                        &root.general.authAppIdLst,
                                        &root.general.acctAppIdLst };
-    char *label[] = { "Supported Vendor",
-                      "Auth Application",
-                      "Acct Application" };
+    const char *label[] = { "Supported Vendor",
+                            "Auth Application",
+                            "Acct Application" };
     for (unsigned int i=0;
          i < sizeof(idList)/sizeof(DiameterApplicationIdLst*);
         i++) {
Index: opendiameter-cplusplus/libdiameter/include/aaa_application.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_application.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_application.h
@@ -64,7 +64,7 @@ class DIAMETERBASEPROTOCOL_EXPORT Diamet
 
     public:
         DiameterApplication(AAA_Task &task,
-                            char *cfgfile = NULL) :
+                            const char *cfgfile = NULL) :
             m_Task(task) {
             if (cfgfile) {
                 Open(cfgfile);
@@ -75,7 +75,7 @@ class DIAMETERBASEPROTOCOL_EXPORT Diamet
         }
 
         // Config file loading/un-loading
-        AAAReturnCode Open(char *cfgfile);
+        AAAReturnCode Open(const char *cfgfile);
         AAAReturnCode Close();
 
         // Check for active peers
Index: opendiameter-cplusplus/libdiameter/include/aaa_xml_data.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_xml_data.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_xml_data.h
@@ -45,7 +45,7 @@ class DiameterXMLConfigParser
       virtual ~DiameterXMLConfigParser() {
       }
       virtual void Load(AAA_Task &task, 
-                        char *cfgfile);      
+                        const char *cfgfile);
       virtual void dump();
 };
 
Index: opendiameter-cplusplus/libdiameter/src/aaa_application.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/src/aaa_application.cxx
+++ opendiameter-cplusplus/libdiameter/src/aaa_application.cxx
@@ -35,7 +35,7 @@
 #include "aaa_application.h"
 #include "aaa_log_facility.h"
 
-AAAReturnCode DiameterApplication::Open(char *cfgfile)
+AAAReturnCode DiameterApplication::Open(const char *cfgfile)
 {
     /// sanity check
     if (! m_Task.Running()) {
Index: opendiameter-cplusplus/libdiameter/include/aaa_session_client.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/aaa_session_client.h
+++ opendiameter-cplusplus/libdiameter/include/aaa_session_client.h
@@ -56,7 +56,7 @@ class DIAMETERBASEPROTOCOL_EXPORT Diamet
         virtual ~DiameterClientAuthSession(); 
 
         // This function initializes an AAA client session
-        AAAReturnCode Begin(char *optionValue = 0);
+        AAAReturnCode Begin(const char *optionValue = 0);
 
         /// This fucntion sends a message to the peer session
         virtual AAAReturnCode Send(std::auto_ptr<DiameterMsg> msg);
Index: opendiameter-cplusplus/libdiameter/src/aaa_session_client.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/src/aaa_session_client.cxx
+++ opendiameter-cplusplus/libdiameter/src/aaa_session_client.cxx
@@ -41,7 +41,7 @@ DiameterClientAuthSession::~DiameterClie
     } 
 }
 
-AAAReturnCode DiameterClientAuthSession::Begin(char *optionValue)
+AAAReturnCode DiameterClientAuthSession::Begin(const char *optionValue)
 {
     // re-negotiate the following values
     Attributes().SessionTimeout().IsNegotiated() = false;
Index: opendiameter-cplusplus/libdiameter/test/test_client3.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/test/test_client3.cxx
+++ opendiameter-cplusplus/libdiameter/test/test_client3.cxx
@@ -36,7 +36,7 @@
 #include "diameter_api.h"
 
 static int msgCountPerSession = 5;
-static char *cfgFile = "config/nas1.local.xml";
+static const char *cfgFile = "config/nas1.local.xml";
 
 class AAA_SampleClientAcctRecCollector : 
     public DiameterClientAcctRecCollector
Index: opendiameter-cplusplus/libdiameter/test/test_client4.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/test/test_client4.cxx
+++ opendiameter-cplusplus/libdiameter/test/test_client4.cxx
@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
    task.Start(5);
 
    int msgCountPerSession = 1;
-   char *cfgFile = "config/nas1.local.xml";
+   const char *cfgFile = "config/nas1.local.xml";
 
    if (argc == 2) {
        cfgFile = argv[1];
Index: opendiameter-cplusplus/libdiameter/test/test_client5.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/test/test_client5.cxx
+++ opendiameter-cplusplus/libdiameter/test/test_client5.cxx
@@ -41,7 +41,7 @@ class AAA_SampleClient : public Diameter
         // client session. Note that the application is responsible
         // for instantiating this object
     protected:
-        typedef enum {
+        enum {
             MSG_COUNT = 5
         };
         
@@ -239,7 +239,7 @@ int main(int argc, char *argv[])
    AAA_Task task;
    task.Start(5);
 
-   char *cfgFile = "config/nas1.local.xml";
+   const char *cfgFile = "config/nas1.local.xml";
 
    if (argc == 2) {
        cfgFile = argv[1];
Index: opendiameter-cplusplus/libodutl/src/od_utl_xml_sax_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libodutl/src/od_utl_xml_sax_parser.cxx
+++ opendiameter-cplusplus/libodutl/src/od_utl_xml_sax_parser.cxx
@@ -220,7 +220,7 @@ void OD_Utl_XML_SaxParser::endElement(co
    m_currentElement = NULL;
 }
 
-void OD_Utl_XML_SaxParser::Load(char* xmlFile)
+void OD_Utl_XML_SaxParser::Load(const char* xmlFile)
 {
    ACEXML_FileCharStream *fstm = NULL;
    if (xmlFile == NULL) {
Index: opendiameter-cplusplus/libdiameter/src/aaa_route_msg_router.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/src/aaa_route_msg_router.cxx
+++ opendiameter-cplusplus/libdiameter/src/aaa_route_msg_router.cxx
@@ -291,8 +291,8 @@ AAA_ROUTE_RESULT DiameterMsgRouter::RcRo
         if (app == NULL) {
 
             diameter_unsigned32_t *idPtr = NULL;
-            char *avpNames[] = { DIAMETER_AVPNAME_AUTHAPPID,
-                                 DIAMETER_AVPNAME_ACCTAPPID };
+            const char *avpNames[] = { DIAMETER_AVPNAME_AUTHAPPID,
+                                       DIAMETER_AVPNAME_ACCTAPPID };
             DiameterUInt32AvpContainerWidget id(msg->acl);
             for (unsigned int i=0; i<sizeof(avpNames)/sizeof(char*); i++) {
                 if ((idPtr = id.GetAvp(avpNames[i]))) {
@@ -317,8 +317,8 @@ AAA_ROUTE_RESULT DiameterMsgRouter::RcRo
                     }
 
                     diameter_unsigned32_t *value = NULL;
-                    char *avpNames[] = { DIAMETER_AVPNAME_AUTHAPPID,
-                                         DIAMETER_AVPNAME_ACCTAPPID };
+                    const char *avpNames[] = { DIAMETER_AVPNAME_AUTHAPPID,
+                                               DIAMETER_AVPNAME_ACCTAPPID };
                     DiameterUInt32AvpContainerWidget gId(*grouped);
                     for (unsigned int i=0; i<sizeof(avpNames)/sizeof(char*); i++) {
                         if ((value = gId.GetAvp(avpNames[i]))) {
@@ -852,8 +852,8 @@ int DiameterMsgRouter::RedirectAgent::Re
 
     try {
         diameter_unsigned32_t *idPtr;
-        char *avpNames[] = { DIAMETER_AVPNAME_AUTHAPPID,
-                             DIAMETER_AVPNAME_ACCTAPPID };
+        const char *avpNames[] = { DIAMETER_AVPNAME_AUTHAPPID,
+                                   DIAMETER_AVPNAME_ACCTAPPID };
         DiameterUInt32AvpContainerWidget id(msg->acl);
         for (unsigned int i=0; i<sizeof(avpNames)/sizeof(char*); i++) {
             if ((idPtr = id.GetAvp(avpNames[i]))) {
@@ -878,8 +878,8 @@ int DiameterMsgRouter::RedirectAgent::Re
                 }
 
                 diameter_unsigned32_t *value = NULL;
-                char *avpNames[] = { DIAMETER_AVPNAME_AUTHAPPID,
-                                     DIAMETER_AVPNAME_ACCTAPPID };
+                const char *avpNames[] = { DIAMETER_AVPNAME_AUTHAPPID,
+                                           DIAMETER_AVPNAME_ACCTAPPID };
                 DiameterUInt32AvpContainerWidget gId(*grouped);
                 for (unsigned int i=0; i<sizeof(avpNames)/sizeof(char*); i++) {
                     if ((value = gId.GetAvp(avpNames[i]))) {
Index: opendiameter-cplusplus/libdiametermip4/src/diameter_mip4_amr_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiametermip4/src/diameter_mip4_amr_parser.cxx
+++ opendiameter-cplusplus/libdiametermip4/src/diameter_mip4_amr_parser.cxx
@@ -61,7 +61,7 @@ AMR_Parser::parseAppToRaw()
 
   
   // Specify the header.
-  diameter_hdr_flag flag = {1,0,0};
+  diameter_hdr_flag flag = {1,0,0,0,0};
   DiameterMsgHeader mnrHdr(1, 0, flag, code, appId, 0, 0);
   aaaMessage.hdr = mnrHdr;
 
Index: opendiameter-cplusplus/libdiametermip4/src/diameter_mip4_ama_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiametermip4/src/diameter_mip4_ama_parser.cxx
+++ opendiameter-cplusplus/libdiametermip4/src/diameter_mip4_ama_parser.cxx
@@ -61,7 +61,7 @@ AMA_Parser::parseAppToRaw()
     }
 
   // Specify the header.
-  diameter_hdr_flag flag = {0,0,0};  // Answer
+  diameter_hdr_flag flag = {0,0,0,0,0};  // Answer
   DiameterMsgHeader mnAnsr(1, 0, flag, code, appId, 0, 0);
   aaaMessage.hdr = mnAnsr;
 
Index: opendiameter-cplusplus/libdiametermip4/src/diameter_mip4_har_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiametermip4/src/diameter_mip4_har_parser.cxx
+++ opendiameter-cplusplus/libdiametermip4/src/diameter_mip4_har_parser.cxx
@@ -60,7 +60,7 @@ HAR_Parser::parseAppToRaw()
     }
 
   // Specify the header.
-  diameter_hdr_flag flag = {1,0,0};
+  diameter_hdr_flag flag = {1,0,0,0,0};
   DiameterMsgHeader mnHdr(1, 0, flag, code, appId, 0, 0);
   aaaMessage.hdr = mnHdr;
 
Index: opendiameter-cplusplus/libdiametermip4/src/diameter_mip4_haa_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiametermip4/src/diameter_mip4_haa_parser.cxx
+++ opendiameter-cplusplus/libdiametermip4/src/diameter_mip4_haa_parser.cxx
@@ -61,7 +61,7 @@ HAA_Parser::parseAppToRaw()
     }
 
   // Specify the header.
-  diameter_hdr_flag flag = {0,0,0};  // Answer
+  diameter_hdr_flag flag = {0,0,0,0,0};  // Answer
   DiameterMsgHeader haHdr(1, 0, flag, code, appId, 0, 0);
   aaaMessage.hdr = haHdr;
 
Index: opendiameter-cplusplus/libdiametereap/src/diameter_eap_der_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiametereap/src/diameter_eap_der_parser.cxx
+++ opendiameter-cplusplus/libdiametereap/src/diameter_eap_der_parser.cxx
@@ -63,7 +63,7 @@ DER_Parser::parseAppToRaw()
     }
 
   // Specify the header.
-  diameter_hdr_flag flag = {1,1,0};
+  diameter_hdr_flag flag = {1,1,0,0,0};
   DiameterMsgHeader dHdr(1, 0, flag, code, appId, 0, 0);
   aaaMessage.hdr = dHdr;
 
Index: opendiameter-cplusplus/libdiametereap/src/diameter_eap_dea_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiametereap/src/diameter_eap_dea_parser.cxx
+++ opendiameter-cplusplus/libdiametereap/src/diameter_eap_dea_parser.cxx
@@ -64,7 +64,7 @@ DEA_Parser::parseAppToRaw()
     }
 
   // Specify the header.
-  diameter_hdr_flag flag = {0,0,0};  // Answer
+  diameter_hdr_flag flag = {0,0,0,0,0};  // Answer
   DiameterMsgHeader hdr(1, 0, flag, code, appId, 0, 0);
   aaaMessage.hdr = hdr;
 
Index: opendiameter-cplusplus/libdiameter/include/diameter_api.h
===================================================================
--- opendiameter-cplusplus.orig/libdiameter/include/diameter_api.h
+++ opendiameter-cplusplus/libdiameter/include/diameter_api.h
@@ -82,14 +82,14 @@ class DIAMETERBASEPROTOCOL_EXPORT AAAApp
     public:
         AAAApplicationCore() { 
         }
-        AAAApplicationCore(char *configFileName, 
+        AAAApplicationCore(const char *configFileName, 
                            AAA_Task &task) {
             Open(configFileName, task);
         }
         virtual ~AAAApplicationCore() {
             Close();
         }
-        AAAReturnCode Open(char *configFileName, 
+        AAAReturnCode Open(const char *configFileName, 
                            AAA_Task &task) {
 	    if (! m_Handle.get()) {
 	        m_Handle = std::auto_ptr<DiameterApplication>
Index: opendiameter-cplusplus/libdiameternasreq/src/diameter_nasreq_aareq_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameternasreq/src/diameter_nasreq_aareq_parser.cxx
+++ opendiameter-cplusplus/libdiameternasreq/src/diameter_nasreq_aareq_parser.cxx
@@ -62,7 +62,7 @@ AA_RequestParser::parseAppToRaw()
     }
 
   // Specify the header.
-  diameter_hdr_flag flag = {1,1,0};
+  diameter_hdr_flag flag = {1,1,0,0,0};
   DiameterMsgHeader hdr(1, 0, flag, code, appId, 0, 0);
   aaaMessage.hdr = hdr;
 
Index: opendiameter-cplusplus/libdiameternasreq/src/diameter_nasreq_aaans_parser.cxx
===================================================================
--- opendiameter-cplusplus.orig/libdiameternasreq/src/diameter_nasreq_aaans_parser.cxx
+++ opendiameter-cplusplus/libdiameternasreq/src/diameter_nasreq_aaans_parser.cxx
@@ -64,7 +64,7 @@ AA_AnswerParser::parseAppToRaw()
     }
 
   // Specify the header.
-  diameter_hdr_flag flag = {0,0,0};  // Answer
+  diameter_hdr_flag flag = {0,0,0,0,0};  // Answer
   DiameterMsgHeader hdr(1, 0, flag, code, appId, 0, 0);
   aaaMessage.hdr = hdr;
 
Index: opendiameter-cplusplus/applications/nas/include/nasd_config.h
===================================================================
--- opendiameter-cplusplus.orig/applications/nas/include/nasd_config.h
+++ opendiameter-cplusplus/applications/nas/include/nasd_config.h
@@ -50,7 +50,7 @@ class NASD_EntryMap :
                OD_Utl_XML_ContentConvNull<NASD_Map> > 
 {
   public:
-     NASD_EntryMap(NASD_Map &arg, char *name,
+     NASD_EntryMap(NASD_Map &arg, const char *name,
                    NASD_Identity &ident,
                    OD_Utl_XML_SaxParser &parser) :
          OD_Utl_XML_RegisteredElement
Index: opendiameter-cplusplus/applications/nas/include/nasd_eap_backend.h
===================================================================
--- opendiameter-cplusplus.orig/applications/nas/include/nasd_eap_backend.h
+++ opendiameter-cplusplus/applications/nas/include/nasd_eap_backend.h
@@ -49,7 +49,7 @@ class NASD_EapBackendAuthGpskStateMachin
      friend class EapMethodStateMachineCreator
                   <NASD_EapBackendAuthGpskStateMachine>;
 
-     typedef enum {
+     enum {
         DEFAULT_AUTH_PERIOD = 3600
      };
 
@@ -126,7 +126,7 @@ class NASD_EapBackendAuthMd5StateMachine
      friend class EapMethodStateMachineCreator
                   <NASD_EapBackendAuthMd5StateMachine>;
 
-     typedef enum {
+     enum {
         DEFAULT_AUTH_PERIOD = 3600
      };
 
Index: opendiameter-cplusplus/applications/aaa/include/aaad_user_db.h
===================================================================
--- opendiameter-cplusplus.orig/applications/aaa/include/aaad_user_db.h
+++ opendiameter-cplusplus/applications/aaa/include/aaad_user_db.h
@@ -68,7 +68,7 @@ class AAAD_UserEapMd5Method
 	 return m_PasswdType;
       }
       static PASSWD_TYPE PasswordType(std::string &t) {
-         static char *strType[] = {
+         static const char *strType[] = {
 	   "system", "flat", "none" // same order as enum
          };
          for (unsigned int i = 0; 
@@ -133,7 +133,7 @@ class AAAD_UserEntryParser :
                OD_Utl_XML_ContentConvNull<AAAD_UserDb> > 
 {
   public:
-     AAAD_UserEntryParser(AAAD_UserDb &arg, char *name,
+     AAAD_UserEntryParser(AAAD_UserDb &arg, const char *name,
                           OD_Utl_XML_SaxParser &parser) :
          OD_Utl_XML_RegisteredElement
               <AAAD_UserDb,
Index: opendiameter-cplusplus/applications/pana/pacd.cxx
===================================================================
--- opendiameter-cplusplus.orig/applications/pana/pacd.cxx
+++ opendiameter-cplusplus/applications/pana/pacd.cxx
@@ -176,8 +176,8 @@ class PeerChannel : public PANA_ClientEv
        virtual bool IsKeyAvailable(pana_octetstring_t &key) {
 #ifdef KEY_TESTING
           static int toggle = 0;
-          static char *keys[] = { "0123456789012345678901234567890123456789012345678901234567890123",
-                                  "3210987654321098765432109876543210987654321098765432109876543210" };
+          static const char *keys[] = { "0123456789012345678901234567890123456789012345678901234567890123",
+                                        "3210987654321098765432109876543210987654321098765432109876543210" };
           key.assign(keys[toggle]);
           toggle = (toggle) ? 0 : 1;
           return true;