[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4888 - gnuradio/branches/developers/eb/ibu/mblock/src
|
From: |
eb |
|
Subject: |
[Commit-gnuradio] r4888 - gnuradio/branches/developers/eb/ibu/mblock/src/lib |
|
Date: |
Thu, 5 Apr 2007 18:18:58 -0600 (MDT) |
Author: eb
Date: 2007-04-05 18:18:58 -0600 (Thu, 05 Apr 2007)
New Revision: 4888
Modified:
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_class_registry.h
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock.cc
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock.h
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock_impl.cc
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock_impl.h
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime.h
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_nop.cc
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_nop.h
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_thread_per_mblock.h
Log:
renamed constructor_arg -> user_arg
Modified: gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_class_registry.h
===================================================================
--- gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_class_registry.h
2007-04-06 00:10:15 UTC (rev 4887)
+++ gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_class_registry.h
2007-04-06 00:18:58 UTC (rev 4888)
@@ -26,7 +26,7 @@
//! conceptually, pointer to constructor
typedef mb_mblock_sptr (*mb_mblock_maker_t)(mb_runtime *runtime,
const std::string &instance_name,
- pmt_t constructor_arg);
+ pmt_t user_arg);
/*
* \brief Maintain mapping between mblock class_name and factory (maker)
@@ -40,9 +40,9 @@
template<class mblock>
mb_mblock_sptr mb_mblock_maker(mb_runtime *runtime,
const std::string &instance_name,
- pmt_t constructor_arg)
+ pmt_t user_arg)
{
- return mb_mblock_sptr(new mblock(runtime, instance_name, constructor_arg));
+ return mb_mblock_sptr(new mblock(runtime, instance_name, user_arg));
}
#define REGISTER_MBLOCK_CLASS(name) \
Modified: gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock.cc
2007-04-06 00:10:15 UTC (rev 4887)
+++ gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock.cc
2007-04-06 00:18:58 UTC (rev 4888)
@@ -77,10 +77,10 @@
void
mb_mblock::define_component(const std::string &component_name,
const std::string &class_name,
- pmt_t constructor_arg)
+ pmt_t user_arg)
{
- d_impl->define_component(component_name, class_name, constructor_arg);
+ d_impl->define_component(component_name, class_name, user_arg);
}
void
Modified: gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock.h
===================================================================
--- gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock.h
2007-04-06 00:10:15 UTC (rev 4887)
+++ gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock.h
2007-04-06 00:18:58 UTC (rev 4888)
@@ -121,12 +121,12 @@
*
* \param component_name The name of the sub-component (must be unique with
this mblock).
* \param class_name The class of the instance that is to be created.
- * \param constructor_arg The argument to pass to the constructor of the
component.
+ * \param user_arg The argument to pass to the constructor of the component.
*/
void
define_component(const std::string &component_name,
const std::string &class_name,
- pmt_t constructor_arg = PMT_NIL);
+ pmt_t user_arg = PMT_NIL);
/*!
* \brief connect endpoint_1 to endpoint_2
Modified: gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock_impl.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock_impl.cc
2007-04-06 00:10:15 UTC (rev 4887)
+++ gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock_impl.cc
2007-04-06 00:18:58 UTC (rev 4888)
@@ -87,7 +87,7 @@
void
mb_mblock_impl::define_component(const std::string &name,
const std::string &class_name,
- pmt_t constructor_arg)
+ pmt_t user_arg)
{
{
mbi_runtime_lock l(this);
@@ -101,7 +101,7 @@
mb_mblock_sptr component =
d_runtime->create_component(instance_name() + "/" + name,
- class_name, constructor_arg);
+ class_name, user_arg);
{
mbi_runtime_lock l(this);
Modified: gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock_impl.h
===================================================================
--- gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock_impl.h
2007-04-06 00:10:15 UTC (rev 4887)
+++ gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_mblock_impl.h
2007-04-06 00:18:58 UTC (rev 4888)
@@ -80,12 +80,12 @@
*
* \param component_name The name of the sub-component (must be unique with
this mblock).
* \param class_name The class of the instance that is to be created.
- * \param constructor_arg The argument to pass to the constructor of the
component.
+ * \param user_arg The argument to pass to the constructor of the component.
*/
void
define_component(const std::string &component_name,
const std::string &class_name,
- pmt_t constructor_arg);
+ pmt_t user_arg);
/*!
* \brief connect endpoint_1 to endpoint_2
Modified: gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime.h
===================================================================
--- gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime.h
2007-04-06 00:10:15 UTC (rev 4887)
+++ gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime.h
2007-04-06 00:18:58 UTC (rev 4888)
@@ -82,7 +82,7 @@
virtual mb_mblock_sptr
create_component(const std::string &instance_name,
const std::string &class_name,
- pmt_t constructor_arg) = 0;
+ pmt_t user_arg) = 0;
};
#endif /* INCLUDED_MB_RUNTIME_H */
Modified: gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_nop.cc
===================================================================
--- gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_nop.cc
2007-04-06 00:10:15 UTC (rev 4887)
+++ gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_nop.cc
2007-04-06 00:18:58 UTC (rev 4888)
@@ -48,10 +48,10 @@
bool
mb_runtime_nop::run(const std::string &instance_name,
const std::string &class_name,
- pmt_t constructor_arg)
+ pmt_t user_arg)
{
mb_mblock_sptr component =
- create_component(instance_name, class_name, constructor_arg);
+ create_component(instance_name, class_name, user_arg);
return true;
}
@@ -59,11 +59,11 @@
mb_mblock_sptr
mb_runtime_nop::create_component(const std::string &instance_name,
const std::string &class_name,
- pmt_t constructor_arg)
+ pmt_t user_arg)
{
mb_mblock_maker_t maker;
if (!mb_class_registry::lookup_maker(class_name, &maker))
throw mbe_no_such_class(0, class_name + " (in " + instance_name + ")");
- return maker(this, instance_name, constructor_arg);
+ return maker(this, instance_name, user_arg);
}
Modified: gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_nop.h
===================================================================
--- gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_nop.h
2007-04-06 00:10:15 UTC (rev 4887)
+++ gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_nop.h
2007-04-06 00:18:58 UTC (rev 4888)
@@ -40,13 +40,13 @@
bool run(const std::string &instance_name,
const std::string &class_name,
- pmt_t constructor_arg);
+ pmt_t user_arg);
protected:
mb_mblock_sptr
create_component(const std::string &instance_name,
const std::string &class_name,
- pmt_t constructor_arg);
+ pmt_t user_arg);
};
#endif /* INCLUDED_MB_RUNTIME_NOP_H */
Modified:
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_thread_per_mblock.h
===================================================================
---
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_thread_per_mblock.h
2007-04-06 00:10:15 UTC (rev 4887)
+++
gnuradio/branches/developers/eb/ibu/mblock/src/lib/mb_runtime_thread_per_mblock.h
2007-04-06 00:18:58 UTC (rev 4888)
@@ -34,13 +34,13 @@
bool run(const std::string &instance_name,
const std::string &class_name,
- pmt_t constructor_arg);
+ pmt_t user_arg);
protected:
mb_mblock_sptr
create_component(const std::string &instance_name,
const std::string &class_name,
- pmt_t constructor_arg);
+ pmt_t user_arg);
};
#endif /* INCLUDED_MB_RUNTIME_THREAD_PER_MBLOCK_H */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4888 - gnuradio/branches/developers/eb/ibu/mblock/src/lib,
eb <=