Skip to content

fixed int overflow in 64bit systems and added c++11 support #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phleba wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed int overflow in 64bit systems and added c++11 support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions shared_memory_interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,25 @@ target_link_libraries(shared_memory_manager
${Boost_LIBRARIES} -lrt
)

install(TARGETS shared_memory_remover shared_memory_manager
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

install(DIRECTORY scripts
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
PATTERN "scripts/*"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ
)

install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.hpp"
)



## Add cmake target dependencies of the executable/library
## as an example, message headers may need to be generated before nodes
# add_dependencies(shared_memory_interface ros_shared_memory_interface_generate_messages_cpp)
Expand Down
3 changes: 2 additions & 1 deletion shared_memory_interface/include/shared_memory_interface/shared_memory_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <stdio.h>
#include <algorithm>
#include <stdlib.h>
#include <fstream>

#include <unistd.h>
#include <pwd.h>
Expand Down Expand Up @@ -116,7 +117,7 @@ namespace shared_memory_interface
{
std::string shmmax_string;
std::getline(shmmax_file_read, shmmax_string);
unsigned int shmmax = atof(shmmax_string.c_str());
unsigned long long int shmmax = atof(shmmax_string.c_str());
shmmax_file_read.close();
if(shmmax < size)
{
Expand Down