Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
ce2e1d12
Commit
ce2e1d12
authored
Feb 21, 2015
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Перешёл на использование omni_options (аргумент в функции ORB_init()).
parent
b3b9b297
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
8 deletions
+5
-8
libuniset2.spec
conf/libuniset2.spec
+5
-1
ORepHelpers.cc
src/ObjectRepository/ORepHelpers.cc
+0
-7
No files found.
conf/libuniset2.spec
View file @
ce2e1d12
...
...
@@ -12,7 +12,7 @@
Name: libuniset2
Version: 2.0
Release: alt1
6
Release: alt1
7
Summary: UniSet - library for building distributed industrial control systems
...
...
@@ -406,6 +406,10 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet2.pc
%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
- add <omniORB> section to configure.xml (for use in the ORB_init())
...
...
src/ObjectRepository/ORepHelpers.cc
View file @
ce2e1d12
...
...
@@ -132,11 +132,7 @@ namespace ORepHelpers
ulogrep
<<
"getContext: получили "
<<
cname
<<
endl
;
// Если _var
// return CosNaming::NamingContext::_duplicate(ctx);
return
ctx
.
_retn
();
// Если _ptr
// return ctx;
}
// ---------------------------------------------------------------------------------------------------------------
...
...
@@ -191,9 +187,6 @@ namespace ORepHelpers
ulogrep
<<
"OREPHELP: get root context ok"
<<
endl
;
// // Если создан как _ptr
// return rootContext;
// Если создан как _var
return
rootContext
.
_retn
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment