Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
portabledsb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
App_Technologies
portabledsb
Commits
3dfaaa98
Commit
3dfaaa98
authored
Nov 16, 2015
by
Jacob Gladish
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed build on Linux
parent
b74fa4c7
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
10 deletions
+24
-10
Adapters/MockAdapter/MockAdapter.cpp
Adapters/MockAdapter/MockAdapter.cpp
+6
-5
Adapters/MockAdapter/MockAdapterDevice.cpp
Adapters/MockAdapter/MockAdapterDevice.cpp
+1
-1
Bridge/BridgeConfig.cpp
Bridge/BridgeConfig.cpp
+1
-0
Common/Guid.h
Common/Guid.h
+6
-1
Common/Log.cpp
Common/Log.cpp
+6
-1
Common/Variant.h
Common/Variant.h
+1
-0
Makefile
Makefile
+3
-2
No files found.
Adapters/MockAdapter/MockAdapter.cpp
View file @
3dfaaa98
...
...
@@ -84,7 +84,8 @@ int32_t AdapterLib::MockAdapter::EnumDevices(
shared_ptr
<
Bridge
::
IAdapterIoRequest
>*
req
)
{
if
(
req
)
*
req
=
NULL
;
req
->
reset
();
deviceList
.
clear
();
std
::
copy
(
m_devices
.
begin
(),
m_devices
.
end
(),
std
::
back_inserter
(
deviceList
));
...
...
@@ -98,7 +99,7 @@ int32_t AdapterLib::MockAdapter::GetProperty(
shared_ptr
<
Bridge
::
IAdapterIoRequest
>*
req
)
{
if
(
req
)
*
req
=
NULL
;
req
->
reset
()
;
shared_ptr
<
MockAdapterProperty
>
mockAdapterProperty
=
dynamic_pointer_cast
<
MockAdapterProperty
>
(
prop
);
if
(
!
mockAdapterProperty
)
...
...
@@ -123,7 +124,7 @@ int32_t AdapterLib::MockAdapter::SetProperty(
shared_ptr
<
Bridge
::
IAdapterIoRequest
>*
req
)
{
if
(
req
)
*
req
=
NULL
;
req
->
reset
()
;
shared_ptr
<
MockAdapterProperty
>
mockAdapterProperty
=
dynamic_pointer_cast
<
MockAdapterProperty
>
(
prop
);
if
(
!
mockAdapterProperty
)
...
...
@@ -150,7 +151,7 @@ int32_t AdapterLib::MockAdapter::GetPropertyValue(
shared_ptr
<
Bridge
::
IAdapterIoRequest
>*
req
)
{
if
(
req
)
*
req
=
NULL
;
req
->
reset
()
;
shared_ptr
<
MockAdapterProperty
>
mockAdapterProperty
=
dynamic_pointer_cast
<
MockAdapterProperty
>
(
prop
);
if
(
!
mockAdapterProperty
)
...
...
@@ -172,7 +173,7 @@ int32_t AdapterLib::MockAdapter::SetPropertyValue(
shared_ptr
<
Bridge
::
IAdapterIoRequest
>*
req
)
{
if
(
req
)
*
req
=
NULL
;
req
->
reset
();
shared_ptr
<
MockAdapterProperty
>
mockAdapterProperty
=
dynamic_pointer_cast
<
MockAdapterProperty
>
(
prop
);
if
(
!
mockAdapterProperty
)
...
...
Adapters/MockAdapter/MockAdapterDevice.cpp
View file @
3dfaaa98
...
...
@@ -61,7 +61,7 @@ int32_t MockAdapterDevice::DispatchMethod(
shared_ptr
<
Bridge
::
IAdapterIoRequest
>*
req
)
{
if
(
req
)
*
req
=
NULL
;
req
->
reset
()
;
int32_t
st
=
ER_OK
;
if
(
method
->
GetName
()
==
kDeviceResetMethod
)
...
...
Bridge/BridgeConfig.cpp
View file @
3dfaaa98
...
...
@@ -3,6 +3,7 @@
#include <string>
#include <sstream>
#include <string.h>
#include <strings.h>
#include <libxml/tree.h>
...
...
Common/Guid.h
View file @
3dfaaa98
...
...
@@ -12,8 +12,13 @@ namespace Common
{
uuid_t
uuid
;
uuid_generate_random
(
uuid
);
#ifdef __linux__
char
*
s
;
#else
uuid_string_t
s
;
#endif
uuid_unparse
(
uuid
,
s
);
return
Guid
(
std
::
string
(
s
));
...
...
Common/Log.cpp
View file @
3dfaaa98
...
...
@@ -7,6 +7,11 @@
#include <sys/time.h>
#include <time.h>
#ifdef __linux__
#include <unistd.h>
#include <sys/syscall.h>
#endif
#include <map>
namespace
...
...
@@ -55,7 +60,7 @@ namespace
pthread_t
GetCurrentThreadId
()
{
return
pthread_self
();
}
#else
#define ThreadId_FMT "%d"
int32_t
GetCurrentThreadId
()
{
return
syscall
(
SYS
_gettid
);
}
int32_t
GetCurrentThreadId
()
{
return
syscall
(
__NR
_gettid
);
}
#endif
}
...
...
Common/Variant.h
View file @
3dfaaa98
...
...
@@ -3,6 +3,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <string>
#include <string.h>
namespace
Common
{
...
...
Makefile
View file @
3dfaaa98
...
...
@@ -13,10 +13,11 @@ SRCS=DeviceProviders/AllJoynProvider.cpp \
LIBXML_INC
=
/usr/include/libxml2
ALLJOYN_INSTALL_DIR
=
/Users/jgladi200/Work/alljoyn/alljoyn-15.04.00-src/build/darwin/x86/debug/dist/cpp
#ALLJOYN_INSTALL_DIR=/Users/jgladi200/Work/alljoyn/alljoyn-15.04.00-src/build/darwin/x86/debug/dist/cpp
ALLJOYN_INSTALL_DIR
=
/home/gladish/work/alljoyn-15.09.00-src/build/linux/x86_64/debug/dist/cpp/
CXXFLAGS
=
-D
QCC_OS_GROUP_POSIX
-Wall
-Wextra
-g
-std
=
c++0x
-I
.
-I
$(ALLJOYN_INSTALL_DIR)
/inc
-I
$(LIBXML_INC)
LDFLAGS
=
-L
$(ALLJOYN_INSTALL_DIR)
/lib
-lalljoyn
-lcrypto
-lxml2
LDFLAGS
=
-L
$(ALLJOYN_INSTALL_DIR)
/lib
-lalljoyn
-lcrypto
-lxml2
-pthread
-luuid
DEV_PROVIDER_OBJS
=
$(
patsubst
%.cpp, %.o,
$(SRCS)
)
OBJS
=
$(DEV_PROVIDER_OBJS)
...
...
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