Changes to VT/OTF:

Fixed compiler warnings seen with the Clang compiler.

This commit was SVN r30121.

ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/create_filter.cpp

@@ -126,7 +126,6 @@ CTree<string>* addToTree(string parent, uint32_t pid, string child,
 	if (cur_pos == NULL) {
 
 		CTree<string> *children = new CTree<string> ();
-		children = children;
 		children->item = parent;
 		children->str_hash = pid;
 

ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs.cc

@@ -118,7 +118,8 @@ DefinitionsC::DefinitionsC()
 
    // create instance of sub-class GroupCountersC
    //
-   m_groupCntrs = new GroupCountersC( *this );
+//   m_groupCntrs = new GroupCountersC( *this );
+   m_groupCntrs = new GroupCountersC();
    vt_assert( m_groupCntrs );
 
    // create instance of sub-class CommentsC
@@ -128,7 +129,8 @@ DefinitionsC::DefinitionsC()
 
    // create instance of sub-class ProcessGroupsC
    //
-   m_procGrps = new ProcessGroupsC( *this );
+//   m_procGrps = new ProcessGroupsC( *this );
+   m_procGrps = new ProcessGroupsC();
    vt_assert( m_procGrps );
 }
 

ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs.h

@@ -126,7 +126,8 @@ class DefinitionsC::GroupCountersC
 public:
 
    // constructor
-   GroupCountersC( DefinitionsC & _defs ) : m_defs( _defs ) {}
+//   GroupCountersC( DefinitionsC & _defs ) : m_defs( _defs ) {}
+  GroupCountersC() {}
 
    // destructor
    ~GroupCountersC() {}
@@ -190,7 +191,7 @@ public:
 private:
 
    // reference to parent class instance
-   DefinitionsC & m_defs;
+//   DefinitionsC & m_defs;
 
    // set of global process group tokens which have counters
    std::set<uint32_t> m_procGrps;
@@ -255,7 +256,8 @@ class DefinitionsC::ProcessGroupsC
 public:
 
    // constructor
-   ProcessGroupsC( DefinitionsC & _defs ) : m_defs( _defs ) {}
+//   ProcessGroupsC( DefinitionsC & _defs ) : m_defs( _defs ) {}
+   ProcessGroupsC() {}
 
    // destructor
    ~ProcessGroupsC()
@@ -451,7 +453,7 @@ private:
    std::vector<UniqueMembersS*> m_uniqueMembers;
 
    // reference to parent class instance
-   DefinitionsC & m_defs;
+//   DefinitionsC & m_defs;
 
 };
 

ompi/contrib/vt/vt/vtlib/vt_cupti_callback.c

@@ -1574,10 +1574,10 @@ void vt_cupticb_resource(CUpti_CallbackId cbid,
           /* mark the stream as destroyed to be available for reuse */
           vt_cuptiact_markStreamAsDestroyed(resData->context, 
                                             strmID);
+
+          vt_cntl_msg(2, "[CUPTI Callbacks] Destroying stream %d (context %d)",
+                         strmID, resData->context);
         }
-        
-        vt_cntl_msg(2, "[CUPTI Callbacks] Destroying stream %d (context %d)", 
-                       strmID, resData->context);
       }
       
       break;