[eclipseoprofile-cvs] org.eclipse.cdt.oprofile/org.eclipse.cdt.oprofile.core.linux/src ChangeLog,1.8,1.9 samplefile.cc,1.5,1.6 samplefile.h,1.5,1.6

[Jeremy H. <jha...@us...>]

Update of /cvsroot/eclipseoprofile/org.eclipse.cdt.oprofile/org.eclipse.cdt.oprofile.core.linux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27568a/org.eclipse.cdt.oprofile.core.linux/src

Modified Files:
	ChangeLog samplefile.cc samplefile.h 
Log Message:
Adding patch from Keith Seitz from Eclipse.org repository


Index: samplefile.cc
===================================================================
RCS file: /cvsroot/eclipseoprofile/org.eclipse.cdt.oprofile/org.eclipse.cdt.oprofile.core.linux/src/samplefile.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** samplefile.cc	14 Apr 2005 18:42:34 -0000	1.5
--- samplefile.cc	2 May 2006 01:37:25 -0000	1.6
***************
*** 115,119 ****
  
        // "{dep}" must be followed by "{kern}" or "{root}"
!       if (parts[i] != "{kern}" && parts[i] != "{dep}")
  	{
  	  // Error. Filename truncated.
--- 115,119 ----
  
        // "{dep}" must be followed by "{kern}" or "{root}"
!       if (parts[i] != "{kern}" && parts[i] != "{root}")
  	{
  	  // Error. Filename truncated.

Index: samplefile.h
===================================================================
RCS file: /cvsroot/eclipseoprofile/org.eclipse.cdt.oprofile/org.eclipse.cdt.oprofile.core.linux/src/samplefile.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** samplefile.h	14 Apr 2005 18:42:34 -0000	1.5
--- samplefile.h	2 May 2006 01:37:25 -0000	1.6
***************
*** 77,81 ****
    // the lib_image if this is a dependency or image_name if not
    std::string get_name (void) const
!     { return (has_samplefile () ? get_image () : get_lib_image ()); };
  
    // Returns the event name that was collected in this samplefile
--- 77,81 ----
    // the lib_image if this is a dependency or image_name if not
    std::string get_name (void) const
!     { return (is_dependency () ? get_lib_image () : get_image ()); };
  
    // Returns the event name that was collected in this samplefile
***************
*** 127,131 ****
    std::string _filename;  // Disk filename of samplefile
    std::string _image;     // Name of the image recorded
!   std::string _lib_image; // Name of the library (may be "")
    std::string _event;
    std::string _count;
--- 127,131 ----
    std::string _filename;  // Disk filename of samplefile
    std::string _image;     // Name of the image recorded
!   std::string _lib_image; // Name of the library (== _image if not a sub-image)
    std::string _event;
    std::string _count;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/eclipseoprofile/org.eclipse.cdt.oprofile/org.eclipse.cdt.oprofile.core.linux/src/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	14 Apr 2005 18:42:34 -0000	1.8
--- ChangeLog	2 May 2006 01:37:25 -0000	1.9
***************
*** 1,2 ****
--- 1,20 ----
+ 2006-04-28  Keith Seitz  <ke...@re...>
+ 
+ 	* samplefile.h (get_name): Use is_dependency instead of has_samplefile
+ 	when returnin the logical name.
+ 	(_lib_image): Clarify comment.
+ 	* samplefile.cc (_get_info_from_filename): Comment for "{kern}" or
+ 	"{root}" is correct -- code was using "{kern}" and "{dep}", which is
+ 	not correct.
+ 
+ 2005-06-10  Keith Seitz  <ke...@re...>
+ 
+ 	* opxml.cc (main): getopt_long_only returns an int, not a char.
+ 
+ 2005-05-26  Jeremy Handcock  <han...@re...>
+ 
+ 	Eclipse.org Bugzilla #96849:
+ 	* build.xml: Set failonerror="true" for all `exec' tasks.
+ 
  2005-04-14  Keith Seitz  <ke...@re...>