[Mockpp-commits] mockpp ChangeLog,1.33,1.34 TODO,1.38,1.39 mockpp.kdevelop,1.64,1.65

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22866

Modified Files:
	ChangeLog TODO mockpp.kdevelop 
Log Message:
scope fixes for gcc-3.4.3

Index: TODO
===================================================================
RCS file: /cvsroot/mockpp/mockpp/TODO,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- TODO	4 Mar 2005 23:36:59 -0000	1.38
+++ TODO	11 Mar 2005 00:24:53 -0000	1.39
@@ -1,5 +1,5 @@
 
-MixedMockObject
+reset() in ChainableMockObjects
 
 DOC:
 ----

Index: mockpp.kdevelop
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp.kdevelop,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- mockpp.kdevelop	18 Feb 2005 21:07:53 -0000	1.64
+++ mockpp.kdevelop	11 Mar 2005 00:24:53 -0000	1.65
@@ -17,7 +17,7 @@
     </ignoreparts>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
     <secondaryLanguages>
       <language>Perl</language>
       <language>Bash</language>
@@ -28,7 +28,7 @@
   <kdevautoproject>
     <general>
       <activetarget>mockpp/tests/mock_test</activetarget>
-      <useconfiguration>unicode_debug</useconfiguration>
+      <useconfiguration>unicode_gcc_3_4</useconfiguration>
     </general>
     <run>
       <mainprogram/>
@@ -61,18 +61,18 @@
         <envvars/>
         <configargs>--enable-unicode</configargs>
         <builddir>/home/compile/mockpp/u</builddir>
-        <topsourcedir/>
-        <cppflags/>
-        <ldflags/>
+        <topsourcedir></topsourcedir>
+        <cppflags></cppflags>
+        <ldflags></ldflags>
         <ccompiler>kdevgccoptions</ccompiler>
         <cxxcompiler>kdevgppoptions</cxxcompiler>
         <f77compiler>kdevg77options</f77compiler>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cflags/>
-        <cxxflags/>
-        <f77flags/>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cflags></cflags>
+        <cxxflags></cxxflags>
+        <f77flags></f77flags>
       </unicode>
       <ascii>
         <envvars/>
@@ -93,7 +93,7 @@
       </ascii>
       <unicode_debug>
         <envvars/>
-        <configargs>--enable-unicode --enable-debug=full</configargs>
+        <configargs>--enable-unicode --enable-debug=full prefix=/tmp/install</configargs>
         <builddir>/home/compile/mockpp/u</builddir>
         <topsourcedir/>
         <cppflags/>
@@ -125,19 +125,36 @@
         <cxxflags>-O0 -g -Wall -wd383 -wd981</cxxflags>
         <f77flags/>
       </intel_unicode_debug>
+      <unicode_gcc_3_4>
+        <envvars/>
+        <configargs>--enable-unicode --enable-debug=full prefix=/tmp/install</configargs>
+        <builddir>/home/compile/mockpp/gcc-3.4</builddir>
+        <topsourcedir></topsourcedir>
+        <cppflags></cppflags>
+        <ldflags></ldflags>
+        <ccompiler>kdevgccoptions</ccompiler>
+        <cxxcompiler>kdevgppoptions</cxxcompiler>
+        <f77compiler>kdevg77options</f77compiler>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary>g++-3.4.3</cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cflags></cflags>
+        <cxxflags>-O0 -g -Wall </cxxflags>
+        <f77flags></f77flags>
+      </unicode_gcc_3_4>
     </configurations>
   </kdevautoproject>
   <kdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
-      <programargs/>
-      <gdbpath/>
+      <programargs></programargs>
+      <gdbpath></gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>true</floatingtoolbar>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
     </general>
     <display>
       <staticmembers>true</staticmembers>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ChangeLog	4 Mar 2005 21:11:32 -0000	1.33
+++ ChangeLog	11 Mar 2005 00:24:53 -0000	1.34
@@ -3,6 +3,9 @@
                             mockpp history
                             --------------
 
+2005-03-04  1.6.0:    - MixedMockObject combines enhanced mock objects
+                      - scope fixes for g++ 3.4.3
+
 2005-03-04  1.5.0:    - added class ConstraintList
                       - VisitableMockObjects and the according controller also take
                         Constraints as objects instead of actual values.