[m-rev.] trivial diff: undo update of reference manual on release branch

Julien Fischer juliensf at cs.mu.OZ.AU
Wed Mar 16 10:33:22 AEDT 2005


Estimated hours taken: 0.1
Branches: main

doc/reference_manual.texi:
	Undo Ralph's bogus update of the reference manual on the release
	branch - the maybe_thread_safe attribute is not supported on this
	branch.

Julien.

Index: reference_manual.texi
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/reference_manual.texi,v
retrieving revision 1.307.2.2
diff -u -r1.307.2.2 reference_manual.texi
--- reference_manual.texi	15 Mar 2005 03:39:05 -0000	1.307.2.2
+++ reference_manual.texi	15 Mar 2005 23:30:08 -0000
@@ -5729,10 +5729,10 @@
 If omitted, the clause specified by the @samp{foreign_proc} is
 assumed to be impure.

- at item @samp{thread_safe}/@samp{not_thread_safe}/@samp{maybe_thread_safe}
+ at item @samp{thread_safe}/@samp{not_thread_safe}
 This attribute declares whether or not it is safe for multiple threads
 to execute this foreign language code concurrently.
-The default, in case none is specified, is @samp{not_thread_safe}.
+The default, in case neither is specified, is @samp{not_thread_safe}.
 If the foreign language code is declared @samp{thread_safe}, then the
 Mercury implementation is permitted to execute the code concurrently
 from multiple threads without taking any special precautions.
@@ -5748,12 +5748,6 @@
 single mutex.)
 @c XXX this can cause deadlocks if not_thread_safe foreign language code calls
 @c     Mercury which calls foreign language code
-If the foreign language code is declared @samp{maybe_thread_safe} then
-whether the code is considered @samp{thread_safe} or @samp{not_thread_safe}
-depends upon a compiler flag.  This attribute is useful when the
-thread safety of the foreign code itself is conditional.
-The Melbourne Mercury compiler uses the @samp{--maybe-thread-safe}
-option to set the value of the @samp{maybe_thread_safe} attribute.
 @end table

 Additional attributes which are supported by the Melbourne Mercury

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list