Define functions before refering them in templates. Remove incomplete

<string> forward definition.

4 files changed, 170 insertions, 1 deletions

diff --git a/editors/lyx/distinfo b/editors/lyx/distinfo
index 4ebe139e055..2d5a5495858 100644
--- a/editors/lyx/distinfo
+++ b/editors/lyx/distinfo
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.8 2012/03/21 18:06:48 drochner Exp $
+$NetBSD: distinfo,v 1.9 2012/11/23 12:32:00 joerg Exp $
 
 SHA1 (lyx-1.6.10.tar.bz2) = 344e14897ea7d004bf181eac39355f1b08f0af83
 RMD160 (lyx-1.6.10.tar.bz2) = b84409c19d320f915c3254d56d8aa0b40e61540d
 Size (lyx-1.6.10.tar.bz2) = 12559454 bytes
 SHA1 (patch-development_MacOSX_Makefile.in) = ae9e51e3458f8986ae392b146f8684305b7fe25b
 SHA1 (patch-src_WordList.cpp) = d747efcd6ca4d7015a5c6860a8844ac79a65672a
+SHA1 (patch-src_insets_InsetInclude.cpp) = 94d52c40e188a2d8c083720e5b758c862e499726
+SHA1 (patch-src_insets_InsetTabular.cpp) = 9b8f9e5bf96780f17a68f95ba34724fd8b5e34c2
 SHA1 (patch-src_mathed_InsetMath.h) = c178b1436c7a969e29b328dde1a800e9ccb7af0e
 SHA1 (patch-src_mathed_MathData.h) = fcd51f36aa2aae29f75e041d7adb1d88baa370a5
+SHA1 (patch-src_support_strfwd.h) = 4ef82f8703fd68f8b953447f05ab1fd71958c379
 SHA1 (patch-src_support_unicode.cpp) = 71bdc1b929a3c90bed84d6de5aa0734e548c67de
diff --git a/editors/lyx/patches/patch-src_insets_InsetInclude.cpp b/editors/lyx/patches/patch-src_insets_InsetInclude.cpp
new file mode 100644
index 00000000000..eae193e2ee2
--- /dev/null
+++ b/editors/lyx/patches/patch-src_insets_InsetInclude.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_insets_InsetInclude.cpp,v 1.1 2012/11/23 12:32:00 joerg Exp $
+
+--- src/insets/InsetInclude.cpp.orig	2012-11-22 21:58:32.000000000 +0000
++++ src/insets/InsetInclude.cpp
+@@ -806,7 +806,7 @@ support::FileNameList const &
+ 		tmp->setParent(&buffer);
+ 		return cache;
+ 	}
+-	static support::FileNameList const empty;
++	static support::FileNameList empty;
+ 	return empty;
+ }
+ 
diff --git a/editors/lyx/patches/patch-src_insets_InsetTabular.cpp b/editors/lyx/patches/patch-src_insets_InsetTabular.cpp
new file mode 100644
index 00000000000..7f4cd49897c
--- /dev/null
+++ b/editors/lyx/patches/patch-src_insets_InsetTabular.cpp
@@ -0,0 +1,118 @@
+$NetBSD: patch-src_insets_InsetTabular.cpp,v 1.1 2012/11/23 12:32:00 joerg Exp $
+
+--- src/insets/InsetTabular.cpp.orig	2012-11-22 22:03:25.000000000 +0000
++++ src/insets/InsetTabular.cpp
+@@ -176,6 +176,56 @@ private:
+ };
+ 
+ 
++string const tostr(LyXAlignment const & num)
++{
++	switch (num) {
++	case LYX_ALIGN_NONE:
++		return "none";
++	case LYX_ALIGN_BLOCK:
++		return "block";
++	case LYX_ALIGN_LEFT:
++		return "left";
++	case LYX_ALIGN_CENTER:
++		return "center";
++	case LYX_ALIGN_RIGHT:
++		return "right";
++	case LYX_ALIGN_LAYOUT:
++		return "layout";
++	case LYX_ALIGN_SPECIAL:
++		return "special";
++	}
++	return string();
++}
++
++
++string const tostr(Tabular::VAlignment const & num)
++{
++	switch (num) {
++	case Tabular::LYX_VALIGN_TOP:
++		return "top";
++	case Tabular::LYX_VALIGN_MIDDLE:
++		return "middle";
++	case Tabular::LYX_VALIGN_BOTTOM:
++		return "bottom";
++	}
++	return string();
++}
++
++
++string const tostr(Tabular::BoxType const & num)
++{
++	switch (num) {
++	case Tabular::BOX_NONE:
++		return "none";
++	case Tabular::BOX_PARBOX:
++		return "parbox";
++	case Tabular::BOX_MINIPAGE:
++		return "minipage";
++	}
++	return string();
++}
++
++
+ template <class T>
+ string const write_attribute(string const & name, T const & t)
+ {
+@@ -232,56 +282,6 @@ string const write_attribute(string cons
+ }
+ 
+ 
+-string const tostr(LyXAlignment const & num)
+-{
+-	switch (num) {
+-	case LYX_ALIGN_NONE:
+-		return "none";
+-	case LYX_ALIGN_BLOCK:
+-		return "block";
+-	case LYX_ALIGN_LEFT:
+-		return "left";
+-	case LYX_ALIGN_CENTER:
+-		return "center";
+-	case LYX_ALIGN_RIGHT:
+-		return "right";
+-	case LYX_ALIGN_LAYOUT:
+-		return "layout";
+-	case LYX_ALIGN_SPECIAL:
+-		return "special";
+-	}
+-	return string();
+-}
+-
+-
+-string const tostr(Tabular::VAlignment const & num)
+-{
+-	switch (num) {
+-	case Tabular::LYX_VALIGN_TOP:
+-		return "top";
+-	case Tabular::LYX_VALIGN_MIDDLE:
+-		return "middle";
+-	case Tabular::LYX_VALIGN_BOTTOM:
+-		return "bottom";
+-	}
+-	return string();
+-}
+-
+-
+-string const tostr(Tabular::BoxType const & num)
+-{
+-	switch (num) {
+-	case Tabular::BOX_NONE:
+-		return "none";
+-	case Tabular::BOX_PARBOX:
+-		return "parbox";
+-	case Tabular::BOX_MINIPAGE:
+-		return "minipage";
+-	}
+-	return string();
+-}
+-
+-
+ // I would have liked a fromstr template a lot better. (Lgb)
+ bool string2type(string const str, LyXAlignment & num)
+ {
diff --git a/editors/lyx/patches/patch-src_support_strfwd.h b/editors/lyx/patches/patch-src_support_strfwd.h
new file mode 100644
index 00000000000..eb549fcb487
--- /dev/null
+++ b/editors/lyx/patches/patch-src_support_strfwd.h
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_support_strfwd.h,v 1.1 2012/11/23 12:32:00 joerg Exp $
+
+--- src/support/strfwd.h.orig	2012-11-22 21:47:30.000000000 +0000
++++ src/support/strfwd.h
+@@ -28,28 +28,8 @@ namespace lyx { typedef boost::uint32_t 
+ 
+ #endif
+ 
+-
+-namespace std {
+-
+-template<typename Alloc> class allocator;
+-
+-template<typename Char> struct char_traits;
+-template<> struct char_traits<char>;
+-#ifdef USE_WCHAR_T
+-template<> struct char_traits<wchar_t>;
+-#endif
+-
+-template<typename Char, typename Traits, typename Alloc> class basic_string;
+-typedef basic_string<char, char_traits<char>, allocator<char> > string;
+-
+-template<class Char, class Traits> class basic_istream;
+-template<class Char, class Traits> class basic_ostream;
+-
+-typedef basic_istream<char, char_traits<char> > istream;
+-typedef basic_ostream<char, char_traits<char> > ostream;
+-
+-} // namepace std
+-
++#include <string>
++#include <iostream>
+ 
+ namespace lyx {
+