X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fstream.h;h=4b4ac3cfe42d9859d283aa612764c2f25ae16d31;hb=3dca22768a95bef664012559aa9ac977091de6ac;hp=443e757e269e7bd6fefe6702c4242454f61a5c98;hpb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/stream.h b/include/babeltrace/ctf-ir/stream.h
index 443e757e..4b4ac3cf 100644
--- a/include/babeltrace/ctf-ir/stream.h
+++ b/include/babeltrace/ctf-ir/stream.h
@@ -100,39 +100,6 @@ management of Babeltrace objects.
 struct bt_stream;
 struct bt_event;
 
-/**
-@brief  Creates a default CTF IR stream named \p name from the CTF IR
-	stream class \p stream_class.
-
-\p stream_class \em must have a parent
-\link ctfirtraceclass CTF IR trace class\endlink.
-
-If the parent \link ctfirtraceclass trace class\endlink of
-\p stream_class was created by a \link ctfwriter CTF writer\endlink
-object, then the stream object is created in CTF writer mode, and
-you can use the functions of \ref ctfwriterstream on it.
-Otherwise it is created in normal mode: you should only use the
-functions documented in this module on it.
-
-\p name can be \c NULL to create an unnamed stream object.
-
-@param[in] stream_class	CTF IR stream class to use to create the
-			CTF IR stream.
-@param[in] name		Name of the stream object to create (copied on
-			success) or \c NULL to create an unnamed stream.
-@returns		Created stream object, or \c NULL on error.
-
-@prenotnull{stream_class}
-@pre \p stream_class has a parent trace class.
-@postsuccessrefcountret1
-
-@sa bt_stream_create_with_id(): Create a CTF IR stream with a
-	specific ID.
-*/
-extern struct bt_stream *bt_stream_create(
-		struct bt_stream_class *stream_class,
-		const char *name);
-
 /**
 @brief  Creates a default CTF IR stream named \p name with ID \p id
 	from the CTF IR stream class \p stream_class.
@@ -140,10 +107,6 @@ extern struct bt_stream *bt_stream_create(
 \p stream_class \em must have a parent
 \link ctfirtraceclass CTF IR trace class\endlink.
 
-You \em must have created the trace class of \p stream class directly
-with bt_trace_create(), not through bt_writer_create() (use
-bt_stream_create() for this).
-
 \p id \em must be unique amongst the IDs of all the streams created
 from \p stream_class with bt_stream_create_with_id().
 
@@ -160,11 +123,8 @@ from \p stream_class with bt_stream_create_with_id().
 @pre \p id is lesser than or equal to 9223372036854775807 (\c INT64_MAX).
 @pre \p stream_class has a parent trace class.
 @postsuccessrefcountret1
-
-@sa bt_stream_create(): Create a CTF IR stream without an ID.
 */
-extern struct bt_stream *bt_stream_create_with_id(
-		struct bt_stream_class *stream_class,
+extern struct bt_stream *bt_stream_create(struct bt_stream_class *stream_class,
 		const char *name, uint64_t id);
 
 /**
@@ -214,9 +174,6 @@ extern struct bt_stream_class *bt_stream_get_class(
 
 /** @} */
 
-/* Pre-2.0 CTF writer compatibility */
-#define bt_ctf_stream bt_stream
-
 #ifdef __cplusplus
 }
 #endif