SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@140 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2015-06-05 06:31:20 +00:00
parent 2a96214dfd
commit 4838122a7e
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -136,6 +136,9 @@ endif ()
# Add library # Add library
if (${APPLE})
add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
endif (${APPLE})
if (${WIN32}) if (${WIN32})
list(APPEND LIBS ws2_32 Iphlpapi Psapi) list(APPEND LIBS ws2_32 Iphlpapi Psapi)
#execute_process(COMMAND "make_rc_win.bat" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET) #execute_process(COMMAND "make_rc_win.bat" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_QUIET)
@@ -153,7 +156,7 @@ if (${WIN32})
#set(${CMAKE_CXX_FLAGS} "-O2") #set(${CMAKE_CXX_FLAGS} "-O2")
endif () endif ()
else () else ()
set(${CMAKE_CXX_FLAGS} "-O2") set(${CMAKE_CXX_FLAGS} "${CMAKE_CXX_FLAGS} -O2")
if (DEFINED ENV{QNX_HOST}) if (DEFINED ENV{QNX_HOST})
list(APPEND LIBS socket dl) list(APPEND LIBS socket dl)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-32") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-32")

6
src/core/piobject.h
View File

@@ -176,9 +176,9 @@
#else #else
#define __STR(x) #x #define _PI_STR(x) #x
#define __SSTR(x) __STR(x) #define _PI_SSTR(x) _PI_STR(x)
#define LOCATION __FILE__ ":" __SSTR(__LINE__) #define LOCATION __FILE__ ":" _PI_SSTR(__LINE__)
#define PIOBJECT(name) \ #define PIOBJECT(name) \

2
src/io/pibasetransfer.cpp
View File

@@ -94,7 +94,7 @@ void PIBaseTransfer::received(PIByteArray data) {
} }
replies_cnt++; replies_cnt++;
if (is_sending) { if (is_sending) {
if (h.id >= 0 && h.id < replies.size()) if (h.id < replies.size())
replies[h.id] = pt; replies[h.id] = pt;
} }
if (is_receiving && h.id == 0) { if (is_receiving && h.id == 0) {

12
src/io/pifile.cpp
View File

@@ -47,9 +47,15 @@
# define _stat_call_ stat # define _stat_call_ stat
# define _stat_link_ lstat # define _stat_link_ lstat
#else #else
# define _fopen_call_ fopen64 # if defined(MAC_OS)
# define _fseek_call_ fseeko64 # define _fopen_call_ fopen
# define _ftell_call_ ftello64 # define _fseek_call_ fseek
# define _ftell_call_ ftell
# else
# define _fopen_call_ fopen64
# define _fseek_call_ fseeko64
# define _ftell_call_ ftello64
# endif
# define _stat_struct_ struct stat64 # define _stat_struct_ struct stat64
# define _stat_call_ stat64 # define _stat_call_ stat64
# define _stat_link_ lstat64 # define _stat_link_ lstat64

2
src/math/pimathbase.h
View File

@@ -162,7 +162,7 @@ inline PIVector<double> abs(const PIVector<double> & v) {
PIVector<double> result; PIVector<double> result;
result.resize(v.size()); result.resize(v.size());
for (uint i = 0; i < v.size(); i++) for (uint i = 0; i < v.size(); i++)
result[i] = abs(v[i]); result[i] = fabs(v[i]);
return result; return result;
} }