diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-17 16:06:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-11-17 16:06:01 +0000 |
| commit | f67b7e1d9ebeba46cffe005003316c1f1eed9e1a (patch) | |
| tree | 96c7cd143df9dbccd8edea443398881d574f598e | |
| parent | e5ef05dfed2fa7aa3c47e99e998db43d852707ae (diff) | |
| parent | 06eee2b4388fa8d4250c04e6338ea99e80ea9a89 (diff) | |
cmcfixes64: merge with DEV300 m63
| -rw-r--r-- | boost/boost_1_39_0.patch | 18 | ||||
| -rw-r--r-- | boost/prj/d.lst | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch index d2ad9fc7db9f..9ab3099fc444 100644 --- a/boost/boost_1_39_0.patch +++ b/boost/boost_1_39_0.patch @@ -181,3 +181,21 @@ } template <typename ScannerT> +--- misc/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2008-06-22 17:05:38.000000000 +0200 ++++ misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2009-10-11 22:34:54.867381817 +0200 +@@ -395,13 +395,13 @@ + } + + bool register_node(void const *r, char const *name_to_register, +- bool trace_node) ++ bool _trace_node) + { + if (infos.find(r) != infos.end()) + return false; + + return infos.insert(rule_infos::value_type(r, +- rule_info(std::string(name_to_register), trace_node)) ++ rule_info(std::string(name_to_register), _trace_node)) + ).second; + } + diff --git a/boost/prj/d.lst b/boost/prj/d.lst index 1db88f339a85..07d5a72a4384 100644 --- a/boost/prj/d.lst +++ b/boost/prj/d.lst @@ -107,6 +107,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug +mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core @@ -257,6 +258,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail ..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor ..\%__SRC%\inc\boost\spirit\home\classic\actor\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl ..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug +..\%__SRC%\inc\boost\spirit\home\classic\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug\impl ..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta ..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl ..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core |