rename GUID -> ServerGUID

avoid ambigious name on windows/mingw
This commit is contained in:
Michael Davidsaver
2017-07-04 17:57:20 +02:00
parent 3ea8d7c71c
commit 05b6da623a
14 changed files with 28 additions and 25 deletions

View File

@ -1193,7 +1193,7 @@ class ServerContext
{
public:
virtual ~ServerContext() {};
virtual const GUID& getGUID() = 0;
virtual const ServerGUID& getGUID() = 0;
virtual const Version& getVersion() = 0;
virtual void initialize(ChannelProviderRegistryPtr const & channelProviderRegistry) = 0;
virtual void run(int32 seconds) = 0;
@ -1216,7 +1216,7 @@ ServerContextPtr startPVAServer(
where
<dl>
<dt>getGUID</dt>
<dd>Returns GUID (12-byte array).</dd>
<dd>Returns ServerGUID (12-byte array).</dd>
<dt>getVersion</dt>
<dd>Get context implementation version.</dd>
<dt>initialize</dt>