22bbff4e59
Add USES=compiler:c++11-lang. Add include <cstring> and <strings.h> to CH2L.cpp. Add include <cstring> to util.cpp. Required to build with GCC (used on GCC architectures): undefined reference to std::__cxx11::basic_string PR: 237549 Approved by: pi (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D20050
59 lines
1.4 KiB
C++
59 lines
1.4 KiB
C++
--- CH2L.cpp.orig 2001-11-11 20:03:19 UTC
|
|
+++ CH2L.cpp
|
|
@@ -18,6 +18,9 @@
|
|
* Boston, MA 02111-1307, USA.
|
|
*
|
|
*/
|
|
+
|
|
+using namespace std;
|
|
+
|
|
#include "CH2L.h"
|
|
#include "util.h"
|
|
#include "safe_ostrstream.h"
|
|
@@ -27,8 +30,9 @@
|
|
#include <stdlib.h>
|
|
#include <assert.h>
|
|
#include <fstream>
|
|
+#include <cstring>
|
|
+#include <strings.h>
|
|
|
|
-using namespace std;
|
|
using namespace Magick;
|
|
|
|
#define ATTRIBUTENESTLIMIT 1000
|
|
@@ -2086,7 +2090,7 @@ void CH2L::make_font_start()
|
|
}
|
|
|
|
|
|
-void CH2L::_implied_font_end(const string &tagdelimiter="",int iterations=1)
|
|
+void CH2L::_implied_font_end(const string &tagdelimiter,int iterations)
|
|
{
|
|
dump_text();
|
|
int cnt = 0;
|
|
@@ -2225,7 +2229,7 @@ void CH2L::end_sup()
|
|
}
|
|
|
|
////////////////////////
|
|
-void CH2L::_implied_a_end(const string &tagdelimiter="",int iterations=1)
|
|
+void CH2L::_implied_a_end(const string &tagdelimiter,int iterations)
|
|
{
|
|
dump_text();
|
|
|
|
@@ -3594,7 +3598,7 @@ void CH2L::_idle_tag_end(const string &htmltag)
|
|
}
|
|
|
|
|
|
-void CH2L::_implied_div_end(const string &tagdelimiter="",int iterations=1)
|
|
+void CH2L::_implied_div_end(const string &tagdelimiter,int iterations)
|
|
{
|
|
bool did_something = false;
|
|
bool alignment_changed = false;
|
|
@@ -3945,7 +3949,7 @@ bool CH2L::openTableDimensionsFile()
|
|
|
|
mTableDimensionsFileName = tsp;
|
|
mTableDimensionsFile.open(tsp.c_str());
|
|
- return mTableDimensionsFile;
|
|
+ return true;
|
|
}
|
|
else
|
|
{
|