Commit Graph

3577 Commits

Author SHA1 Message Date
Martin Hurton
706eb4da8d Code cleanup 2014-06-07 23:05:45 +02:00
Richard Newton
8c616290c8 Merge pull request #1082 from dmeehan1968/exclude-test-abstract-ipc-non-linux
Exclude test_abstract_ipc from non-Linux builds
2014-06-06 12:13:04 +01:00
Dave Meehan
a1f8737976 Exclude test_abstract_ipc from non-Linux builds 2014-06-06 12:08:55 +01:00
Pieter Hintjens
34e8f3c123 Merge pull request #1080 from tberkey/master
Corrected installer source path for VS pdb debug symbols file.  Removed ...
2014-06-05 21:33:27 +02:00
Pieter Hintjens
fae07d919a Merge pull request #1079 from evoskuil/master
Refresh VS 2010/2012 projects and NuGet templ for recent VS2013 updates.
2014-06-05 21:20:17 +02:00
evoskuil
10e5277e9f Update NuGet template to incorporate platform.hpp from relative dir. 2014-06-05 12:13:00 -07:00
evoskuil
455bba6a15 Refresh VS 2010/2012 projects with recent VS2013 updates. 2014-06-05 12:12:18 -07:00
Pieter Hintjens
c23420ce04 Merge pull request #1078 from mkluwe/handle-WSAEADDRINUSE
handle WSAEADDRINUSE in tcp_connecter_t::connect
2014-06-05 20:27:14 +02:00
Matthias Kluwe
fa95d0b5e8 removed whitespace
(accidentially used my preferred style)
2014-06-05 19:39:15 +02:00
Matthias Kluwe
5154c544ff handle WSAEADDRINUSE in tcp_connecter_t::connect
As mentioned on the mailing list, Windows may return WSAEADDRINUSE when binding
(reconnecting) to a port. Added this to the handled error codes as Pieter
suggested.
2014-06-05 19:29:42 +02:00
Richard Newton
ff6b684ab3 Merge pull request #1076 from dmeehan1968/msvc-platform-hpp-no-copy
Remove copy of platform.hpp for MSVC VS2013 builds
2014-06-05 13:15:50 +01:00
Dave Meehan
d775b4539f Modified remote_thr project to not copy platform.hpp 2014-06-05 13:07:26 +01:00
Dave Meehan
66ebe31bf5 Modified remote_lat project to not copy platform.hpp 2014-06-05 13:07:25 +01:00
Dave Meehan
dd95eb96be Modified local_thr project to not copy platform.hpp 2014-06-05 13:07:25 +01:00
Dave Meehan
06e67ff096 Modified local_lat project to not copy platform.hpp 2014-06-05 13:07:25 +01:00
Dave Meehan
7b50270142 Modified inproc_thr project to not copy platform.hpp 2014-06-05 13:07:25 +01:00
Dave Meehan
f5478859b0 Modified inproc_lat project to not copy platform.hpp 2014-06-05 13:07:25 +01:00
Dave Meehan
649f4b0f24 Modified libzmq project to not copy platform.hpp 2014-06-05 13:07:25 +01:00
Pieter Hintjens
d0371dc0f2 Merge pull request #1075 from dmeehan1968/perf-platform-hpp-restore
Restore unpathed references to platform.hpp for cmake builds
2014-06-05 13:33:02 +02:00
Dave Meehan
87ce17e439 Restore unpathed references to platform.hpp for cmake builds 2014-06-05 12:03:13 +01:00
Pieter Hintjens
14afbf9b48 Merge pull request #1074 from dmeehan1968/ignore-suo-in-subfolders
Exclude MSVC temp files regardless of where they are in builds/msvc
2014-06-05 13:02:03 +02:00
Dave Meehan
79575b0dd9 Exclude MSVC SUO files regardless of where they are in the builds/msvc folder 2014-06-05 11:59:23 +01:00
Pieter Hintjens
78ada21eb7 Merge pull request #1073 from evoskuil/master
VS set switch /Z7 in debug static (DebugLIB/DebugLTCG) base props.
2014-06-05 12:51:16 +02:00
evoskuil
f1111ceb0d VS set switch /Z7 in debug static (DebugLIB/DebugLTCG) base props. 2014-06-05 03:28:03 -07:00
evoskuil
cbad7de0ae Whitespace in VS projects. 2014-06-05 03:20:08 -07:00
Pieter Hintjens
4b543e2c98 Merge pull request #1072 from olafmandel/issue_1071
Extend zmq::wsa_error_to_errno()
2014-06-04 17:56:26 +02:00
Olaf Mandel
de9eef3063 Extend zmq::wsa_error_to_errno()
The list of error codes is taken from zmq::wsa_error_no(). Most of the
new WSA error codes result in EFAULT, but some return a more specific
value (even EAGAIN).

Fixes #1071
2014-06-04 17:28:01 +02:00
Pieter Hintjens
ad9838859f Merge pull request #1069 from evoskuil/master
Update VS import props to allow delinking, reset PDB out path change.
2014-06-04 15:14:15 +02:00
Telford Berkey
920371ee6b Corrected installer source path for VS pdb debug symbols file. Removed prefix path to platform.h 2014-06-04 08:47:22 -04:00
Martin Hurton
8e7a8a43b4 Merge pull request #1070 from ricnewton/master
Fix for issue https://github.com/zeromq/libzmq/issues/1065
2014-06-04 13:38:29 +02:00
Richard Newton
c9e86acf61 Set up hwm's before we connect the other end of the pipe in ctx_t::connect_inproc_sockets 2014-06-04 12:13:15 +01:00
evoskuil
6af46c39c7 Update VS import props to allow delinking by dependent projects. 2014-06-04 01:26:39 -07:00
evoskuil
4a02604cc2 Reset PDB out path change in base VS props. 2014-06-04 01:25:41 -07:00
Ian Barber
764a3495c6 Merge pull request #1067 from hintjens/master
Problem: email addresses in AUTHORS harvested for spam
2014-06-03 11:10:02 +01:00
Pieter Hintjens
ff07d85594 Problem: email addresses in AUTHORS harvested for spam
Solution: remove these email addresses, since authors are reachable
via their Git commit history.
2014-06-03 12:00:37 +02:00
Pieter Hintjens
b42b9c9d67 Merge pull request #1066 from hurtonm/master
Style fixes
2014-06-03 11:25:25 +02:00
Martin Hurton
f447386936 Style fixes 2014-06-03 10:42:29 +02:00
Pieter Hintjens
c6e38ec1b7 Merge pull request #1064 from evoskuil/master
cosmetic msvc xml fix
2014-06-03 07:31:53 +02:00
Pieter Hintjens
77f50f9ab8 Merge pull request #1061 from dmeehan1968/fix-perf-platform-hpp-windows
Fix for perf/platform.hpp not being cleaned up by distclean
2014-05-31 16:11:49 +02:00
Dave Meehan
451c94af8e Fix for perf/platform.hpp not being cleaned up by distclean 2014-05-31 13:51:41 +01:00
Pieter Hintjens
b118acb710 Merge pull request #1059 from dmeehan1968/msvc-pdb-output
Added ProgramDataBaseFile directive
2014-05-30 19:05:43 +02:00
Dave Meehan
ed49057fd7 Added ProgramDataBaseFile directive so that .pdb file goes into same directory as the .lib so that debug builds can find it 2014-05-30 17:47:01 +01:00
evoskuil
d456e70d7d cosmetic msvc xml fix 2014-05-26 21:16:43 -07:00
Pieter Hintjens
cfc754f393 Merge pull request #1020 from jemc/inproc_simult
Add failing test reproducing issue #1015.
2014-05-23 16:03:15 +02:00
Pieter Hintjens
ac244b41c5 Merge pull request #1057 from hurtonm/master
Add const qualifier to register_endpoint param
2014-05-23 14:29:38 +02:00
Martin Hurton
dd2be381ad Add const qualifier to register_endpoint param 2014-05-23 12:27:01 +02:00
Joe Eli McIlvain
8b47d36875 Revert "Mark failing test for issue #1015 as XFAIL"
This reverts commit b6c577a9ec.
2014-05-22 12:21:32 -07:00
Pieter Hintjens
99dba23dc7 Merge pull request #1055 from hurtonm/master
Fix race condition in connecting inproc sockets
2014-05-22 10:40:38 +02:00
Martin Hurton
3901d94b27 Fix race condition in connecting inproc sockets 2014-05-22 09:09:45 +02:00
Pieter Hintjens
313b2ec84e Merge pull request #1054 from evoskuil/master
Minor updates to VS build configuration and NuGet packaging.
2014-05-21 16:53:40 +02:00