Commit ce2e1d12 authored by Pavel Vainerman's avatar Pavel Vainerman

Перешёл на использование omni_options (аргумент в функции ORB_init()).

parent b3b9b297
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.0 Version: 2.0
Release: alt16 Release: alt17
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
...@@ -406,6 +406,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname ...@@ -406,6 +406,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet2.pc %exclude %_pkgconfigdir/libUniSet2.pc
%changelog %changelog
* Sat Feb 21 2015 Pavel Vainerman <pv@altlinux.ru> 2.0-alt17
- use omni_options[] argument for ORB_init().
- minor fixes
* Fri Feb 06 2015 Pavel Vainerman <pv@altlinux.ru> 2.0-alt16 * Fri Feb 06 2015 Pavel Vainerman <pv@altlinux.ru> 2.0-alt16
- add <omniORB> section to configure.xml (for use in the ORB_init()) - add <omniORB> section to configure.xml (for use in the ORB_init())
......
...@@ -132,11 +132,7 @@ namespace ORepHelpers ...@@ -132,11 +132,7 @@ namespace ORepHelpers
ulogrep << "getContext: получили "<< cname << endl; ulogrep << "getContext: получили "<< cname << endl;
// Если _var // Если _var
// return CosNaming::NamingContext::_duplicate(ctx);
return ctx._retn(); return ctx._retn();
// Если _ptr
// return ctx;
} }
// --------------------------------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------------------------------
...@@ -191,9 +187,6 @@ namespace ORepHelpers ...@@ -191,9 +187,6 @@ namespace ORepHelpers
ulogrep << "OREPHELP: get root context ok"<< endl; ulogrep << "OREPHELP: get root context ok"<< endl;
// // Если создан как _ptr
// return rootContext;
// Если создан как _var // Если создан как _var
return rootContext._retn(); return rootContext._retn();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment