external/libcmis/0001-rename-class-GetObject-to-avoid-name-clash-on-Window.patch

   1 From 219e6d6586c8280dfd9c4851cee0d14d68b6ad65 Mon Sep 17 00:00:00 2001
   2 From: David Tardon <dtardon@redhat.com>
   3 Date: Fri, 28 Dec 2018 15:26:28 +0100
   4 Subject: [PATCH] rename class GetObject to avoid name clash on Windows
   5
   6 ---
   7  src/libcmis/ws-objectservice.cxx | 2 +-
   8  src/libcmis/ws-requests.cxx      | 2 +-
   9  src/libcmis/ws-requests.hxx      | 7 +++----
  10  3 files changed, 5 insertions(+), 6 deletions(-)
  11
  12 diff --git a/src/libcmis/ws-objectservice.cxx b/src/libcmis/ws-objectservice.cxx
  13 index 9e40085..d57f3cc 100644
  14 --- a/src/libcmis/ws-objectservice.cxx
  15 +++ b/src/libcmis/ws-objectservice.cxx
  16 @@ -71,7 +71,7 @@ libcmis::ObjectPtr ObjectService::getObject( string repoId, string id )
  17  {
  18      libcmis::ObjectPtr object;
  19
  20 -    class GetObject request( repoId, id );
  21 +    GetObjectRequest request( repoId, id );
  22      vector< SoapResponsePtr > responses = m_session->soapRequest( m_url, request );
  23      if ( responses.size( ) == 1 )
  24      {
  25 diff --git a/src/libcmis/ws-requests.cxx b/src/libcmis/ws-requests.cxx
  26 index f8bc245..408d053 100644
  27 --- a/src/libcmis/ws-requests.cxx
  28 +++ b/src/libcmis/ws-requests.cxx
  29 @@ -269,7 +269,7 @@ SoapResponsePtr GetTypeChildrenResponse::create( xmlNodePtr node, RelatedMultipa
  30      return SoapResponsePtr( response );
  31  }
  32
  33 -void GetObject::toXml( xmlTextWriterPtr writer )
  34 +void GetObjectRequest::toXml( xmlTextWriterPtr writer )
  35  {
  36      xmlTextWriterStartElement( writer, BAD_CAST( "cmism:getObject" ) );
  37      xmlTextWriterWriteAttribute( writer, BAD_CAST( "xmlns:cmis" ), BAD_CAST( NS_CMIS_URL ) );
  38 diff --git a/src/libcmis/ws-requests.hxx b/src/libcmis/ws-requests.hxx
  39 index 2c4ae92..534d9a4 100644
  40 --- a/src/libcmis/ws-requests.hxx
  41 +++ b/src/libcmis/ws-requests.hxx
  42 @@ -203,21 +203,20 @@ class GetTypeChildrenResponse : public SoapResponse
  43          std::vector< libcmis::ObjectTypePtr > getChildren( ) { return m_children; }
  44  };
  45
  46 -#undef GetObject
  47 -class GetObject : public SoapRequest
  48 +class GetObjectRequest : public SoapRequest
  49  {
  50      private:
  51          std::string m_repositoryId;
  52          std::string m_id;
  53
  54      public:
  55 -        GetObject( std::string repoId, std::string id ) :
  56 +        GetObjectRequest( std::string repoId, std::string id ) :
  57              m_repositoryId( repoId ),
  58              m_id( id )
  59          {
  60          }
  61
  62 -        ~GetObject( ) { }
  63 +        ~GetObjectRequest( ) { }
  64
  65          void toXml( xmlTextWriterPtr writer );
  66  };
  67 --
  68 2.19.2
  69