3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

MSVC build fixed

Browse Source
This commit is contained in:
Martin Sustrik 2010-08-24 15:58:48 +02:00
parent 9b8993efb4
commit b608c19c5a
3 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
builds/msvc/libzmq/libzmq.vcproj
View File

@ -170,11 +170,11 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath="..\..\..\src\app_thread.cpp" RelativePath="..\..\..\src\command.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\command.cpp" RelativePath="..\..\..\src\connect_session.cpp"
> >
</File> </File>
<File <File
@ -185,10 +185,6 @@
RelativePath="..\..\..\src\devpoll.cpp" RelativePath="..\..\..\src\devpoll.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\push.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\epoll.cpp" RelativePath="..\..\..\src\epoll.cpp"
> >
@ -229,6 +225,10 @@
RelativePath="..\..\..\src\msg_store.cpp" RelativePath="..\..\..\src\msg_store.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\named_session.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\object.cpp" RelativePath="..\..\..\src\object.cpp"
> >
@ -238,7 +238,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\owned.cpp" RelativePath="..\..\..\src\own.cpp"
> >
</File> </File>
<File <File
@ -273,6 +273,14 @@
RelativePath="..\..\..\src\pub.cpp" RelativePath="..\..\..\src\pub.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\pull.cpp"
>
</File>
<File
RelativePath="..\..\..\src\push.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\queue.cpp" RelativePath="..\..\..\src\queue.cpp"
> >
@ -326,7 +334,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\pull.cpp" RelativePath="..\..\..\src\transient_session.cpp"
> >
</File> </File>
<File <File
@ -375,10 +383,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath="..\..\..\src\app_thread.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\atomic_counter.hpp" RelativePath="..\..\..\src\atomic_counter.hpp"
> >
@ -395,6 +399,10 @@
RelativePath="..\..\..\src\config.hpp" RelativePath="..\..\..\src\config.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\connect_session.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\ctx.hpp" RelativePath="..\..\..\src\ctx.hpp"
> >
@ -407,10 +415,6 @@
RelativePath="..\..\..\src\devpoll.hpp" RelativePath="..\..\..\src\devpoll.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\push.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\encoder.hpp" RelativePath="..\..\..\src\encoder.hpp"
> >
@ -483,6 +487,10 @@
RelativePath="..\..\..\src\mutex.hpp" RelativePath="..\..\..\src\mutex.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\named_session.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\object.hpp" RelativePath="..\..\..\src\object.hpp"
> >
@ -492,7 +500,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\owned.hpp" RelativePath="..\..\..\src\own.hpp"
> >
</File> </File>
<File <File
@ -531,6 +539,14 @@
RelativePath="..\..\..\src\pub.hpp" RelativePath="..\..\..\src\pub.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\pull.hpp"
>
</File>
<File
RelativePath="..\..\..\src\push.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\queue.hpp" RelativePath="..\..\..\src\queue.hpp"
> >
@ -588,7 +604,7 @@
> >
</File> </File>
<File <File
RelativePath="..\..\..\src\pull.hpp" RelativePath="..\..\..\src\transient_session.hpp"
> >
</File> </File>
<File <File

9
src/pipe.hpp
View File

@ -32,6 +32,11 @@
namespace zmq namespace zmq
{ {
// Creates a pipe. Returns pointer to reader and writer objects.
void create_pipe (object_t *reader_parent_, object_t *writer_parent_,
uint64_t hwm_, int64_t swap_size_, class reader_t **reader_,
class writer_t **writer_);
// The shutdown mechanism for pipe works as follows: Either endpoint // The shutdown mechanism for pipe works as follows: Either endpoint
// (or even both of them) can ask pipe to terminate by calling 'terminate' // (or even both of them) can ask pipe to terminate by calling 'terminate'
// method. Pipe then terminates in asynchronous manner. When the part of // method. Pipe then terminates in asynchronous manner. When the part of
@ -197,10 +202,6 @@ namespace zmq
void operator = (const writer_t&); void operator = (const writer_t&);
}; };
// Creates a pipe. Returns pointer to reader and writer objects.
void create_pipe (object_t *reader_parent_, object_t *writer_parent_,
uint64_t hwm_, int64_t swap_size_, reader_t **reader_,
writer_t **writer_);
} }
#endif #endif

1
src/socket_base.cpp
View File

@ -307,6 +307,7 @@ int zmq::socket_base_t::bind (const char *addr_)
} }
zmq_assert (false); zmq_assert (false);
return -1;
} }
int zmq::socket_base_t::connect (const char *addr_) int zmq::socket_base_t::connect (const char *addr_)