[Boost-commit] svn:boost r44072 - in branches/proto/v4: . libs/statechart/doc tools/build/v2/tools

From: eric_at_[hidden]
Date: 2008-04-06 11:20:49

Author: eric_niebler
Date: 2008-04-06 11:20:48 EDT (Sun, 06 Apr 2008)
New Revision: 44072
URL: http://svn.boost.org/trac/boost/changeset/44072

Log:
Merged revisions 44062-44070 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r44067 | vladimir_prus | 2008-04-05 22:00:28 -0700 (Sat, 05 Apr 2008) | 7 lines
  
  Make xsltproc more usable standalone.
  
          * tools/xsltproc.jam (xslt-xsltproc): Bind STYLESHEET.
          (xslt-xsltproc-dir): Likewise.
  
  Thanks to Eric Woodruff for the bug report.
........
  r44069 | andreas_huber69 | 2008-04-06 06:13:52 -0700 (Sun, 06 Apr 2008) | 1 line
  
  Added event<> placement new documentation.
........

Properties modified: 
   branches/proto/v4/   (props changed)
Text files modified: 
   branches/proto/v4/libs/statechart/doc/reference.html |     9 +++++++++                               
   branches/proto/v4/tools/build/v2/tools/xsltproc.jam  |     4 ++--                                    
   2 files changed, 11 insertions(+), 2 deletions(-)

Modified: branches/proto/v4/libs/statechart/doc/reference.html
==============================================================================
--- branches/proto/v4/libs/statechart/doc/reference.html	(original)
+++ branches/proto/v4/libs/statechart/doc/reference.html	2008-04-06 11:20:48 EDT (Sun, 06 Apr 2008)
@@ -2997,6 +2997,8 @@
     public:
       static void * <a href=
 "#event::operatornew">operator new</a>( std::size_t size );
+      static void * <a href=
+"#event::operatornew2">operator new</a>( std::size_t size, void * p );
       static void <a href=
 "#event::operatordelete">operator delete</a>( void * pEvent );
 
@@ -3042,6 +3044,13 @@
   <b>Returns</b>: The return value of the above call<br>
   <b>Throws</b>: Whatever the above call throws</p>
   <pre>
+static void * <a name="event::operatornew2" id=
+"event::operatornew2">operator new</a>( std::size_t size, void * p );
+</pre>
+
+  <p><b>Effects</b>: None<br>
+  <b>Returns</b>: <code>p</code></p>
+  <pre>
 static void <a name="event::operatordelete" id=
 "event::operatordelete">operator delete</a>( void * pEvent );
 </pre>

Modified: branches/proto/v4/tools/build/v2/tools/xsltproc.jam
==============================================================================
--- branches/proto/v4/tools/build/v2/tools/xsltproc.jam	(original)
+++ branches/proto/v4/tools/build/v2/tools/xsltproc.jam	2008-04-06 11:20:48 EDT (Sun, 06 Apr 2008)
@@ -101,12 +101,12 @@
     return [ .xsltproc $(target) : $(source) $(stylesheet) : $(properties) : $(dirname) : xslt-xsltproc-dir ] ;
 }
 
-actions xslt-xsltproc
+actions xslt-xsltproc bind STYLESHEET
 {
   $(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<)" "$(STYLESHEET)" "$(>)"
 }
 
-actions xslt-xsltproc-dir
+actions xslt-xsltproc-dir bind STYLESHEET
 {
   $(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<:D)/" "$(STYLESHEET)" "$(>)"
 }