| Summary: | packport of gcc4 fix from trunk to 3.4 branch? | ||
|---|---|---|---|
| Product: | [Unmaintained] kghostview | Reporter: | Walter Meinl <wuno> |
| Component: | general | Assignee: | Luís Pedro Coelho <luis> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | NOR | ||
| Version First Reported In: | unspecified | ||
| Target Milestone: | --- | ||
| Platform: | Gentoo Packages | ||
| OS: | Linux | ||
| Latest Commit: | Version Fixed/Implemented In: | ||
| Sentry Crash Report: | |||
| Attachments: | gcc4 patches vor displayoptions.(h/cpp) from the trunk | ||
|
Description
Walter Meinl
2005-08-05 17:18:54 UTC
Created attachment 12102 [details]
gcc4 patches vor displayoptions.(h/cpp) from the trunk
SVN commit 443732 by thiago:
Removing the templated operator<<, as suggested by Walter Meinl. Thanks
for pointing out.
I hope to get some points with Dirk's gcc4 compile police :-)
BUG:110249
M +1 -1 displayoptions.cpp
M +0 -6 displayoptions.h
--- branches/KDE/3.4/kdegraphics/kghostview/displayoptions.cpp #443731:443732
@@ -56,7 +56,7 @@
res.setMagnification( args->getOption( "scale" ).toFloat() );
res.setPage( args->getOption( "page" ).toInt() - 1 ); // transform from 1-based into 0-based
//res._overridePageMedia = args->getOption( "paper" );
- kdDebug(4500 ) << "Parsed options: " << res << endl;
+ kdDebug(4500 ) << "Parsed options: " << DisplayOptions::toString( res ) << endl;
return res;
}
--- branches/KDE/3.4/kdegraphics/kghostview/displayoptions.h #443731:443732
@@ -109,10 +109,4 @@
setMagnification( 1.0 );
}
-template <typename OutStream>
-OutStream& operator << ( OutStream& out, const DisplayOptions& obj ) {
- out << DisplayOptions::toString( obj ).utf8().data();
- return out;
-}
-
#endif // DISPLAYOPTIONS_H
|