Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Zepeng Liu
OPC UA PubSub
Commits
aa395d19
Commit
aa395d19
authored
Jun 14, 2018
by
Patrick Bellot
Browse files
Merge remote-tracking branch 'origin/linux32_ingopcs2' into windows_ingopcs2
parents
84d92aa6
f79aa2e6
Changes
4
Hide whitespace changes
Inline
Side-by-side
opcua/lib/StandardDataTypes/OpcUa_IPCS_ByteString.h
View file @
aa395d19
...
...
@@ -98,6 +98,7 @@ public:
}
length
=
_length
;
array
=
_array
;
NOT_USED
(
takeItForYou
)
;
}
ByteString
(
uint32_t
value
)
...
...
opcua/lib/StandardDataTypes/OpcUa_IPCS_String.h
View file @
aa395d19
...
...
@@ -95,6 +95,7 @@ public:
:
BaseDataType
()
{
str
=
_str
;
NOT_USED
(
takeItForYou
)
;
}
String
(
const
char
*
const
_str
)
...
...
opcua/lib/s2opc/S2OPC_ClientServices.cpp
View file @
aa395d19
...
...
@@ -157,6 +157,8 @@ MYDLL void ClientService_ServiceFault(
OpcUa_ServiceFault_Clear
(
response
)
;
free
(
responseHeader
)
;
free
(
response
)
;
NOT_USED
(
scConnectionId
)
;
}
...
...
@@ -199,6 +201,8 @@ MYDLL void ClientService_CreateSession(
OpcUa_CreateSessionResponse_Clear
(
response
)
;
free
(
responseHeader
)
;
free
(
response
)
;
NOT_USED
(
scConnectionId
)
;
}
...
...
s2opc_stack/.settings/language.settings.xml
0 → 100644
View file @
aa395d19
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project>
<configuration
id=
"cdt.managedbuild.config.gnu.so.debug.564995990"
name=
"Debug"
>
<extension
point=
"org.eclipse.cdt.core.LanguageSettingsProvider"
>
<provider
copy-of=
"extension"
id=
"org.eclipse.cdt.ui.UserLanguageSettingsProvider"
/>
<provider-reference
id=
"org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider"
ref=
"shared-provider"
/>
<provider-reference
id=
"org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider"
ref=
"shared-provider"
/>
<provider
class=
"org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector"
console=
"false"
env-hash=
"1968678984014786712"
id=
"org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
keep-relative-paths=
"false"
name=
"CDT GCC Built-in Compiler Settings"
parameter=
"${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}""
prefer-non-shared=
"true"
>
<language-scope
id=
"org.eclipse.cdt.core.gcc"
/>
<language-scope
id=
"org.eclipse.cdt.core.g++"
/>
</provider>
</extension>
</configuration>
<configuration
id=
"cdt.managedbuild.config.gnu.so.release.573252170"
name=
"Release"
>
<extension
point=
"org.eclipse.cdt.core.LanguageSettingsProvider"
>
<provider
copy-of=
"extension"
id=
"org.eclipse.cdt.ui.UserLanguageSettingsProvider"
/>
<provider-reference
id=
"org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider"
ref=
"shared-provider"
/>
<provider-reference
id=
"org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider"
ref=
"shared-provider"
/>
<provider
class=
"org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector"
console=
"false"
env-hash=
"1968678984014786712"
id=
"org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
keep-relative-paths=
"false"
name=
"CDT GCC Built-in Compiler Settings"
parameter=
"${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}""
prefer-non-shared=
"true"
>
<language-scope
id=
"org.eclipse.cdt.core.gcc"
/>
<language-scope
id=
"org.eclipse.cdt.core.g++"
/>
</provider>
</extension>
</configuration>
</project>
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