Silence down ne_lock gcc WaE
Wraps this /usr/include/neon/ne_locks.h:125:51: warning: 'int ne_lock(ne_session*, ne_lock*)' hides constructor for 'struct ne_lock' [-Wshadow] into a system header guard.
This commit is contained in:
parent
9b699a2ce1
commit
fc2207ecfd
4 changed files with 57 additions and 3 deletions
|
@ -29,7 +29,7 @@
|
|||
// MARKER(update_precomp.py): autogen include statement, do not remove
|
||||
#include "precompiled_ucb.hxx"
|
||||
|
||||
#include <ne_locks.h>
|
||||
#include "warnings_guard_ne_locks.h"
|
||||
#include <ne_uri.h>
|
||||
#include "rtl/ustring.hxx"
|
||||
#include "osl/time.h"
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#define INCLUDED_NEONLOCKSTORE_HXX
|
||||
|
||||
#include <map>
|
||||
#include "ne_locks.h"
|
||||
#include "warnings_guard_ne_locks.h"
|
||||
#include "osl/mutex.hxx"
|
||||
#include "rtl/ref.hxx"
|
||||
#include "NeonTypes.hxx"
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <ne_utils.h>
|
||||
#include <ne_basic.h>
|
||||
#include <ne_props.h>
|
||||
#include <ne_locks.h>
|
||||
#include "warnings_guard_ne_locks.h"
|
||||
|
||||
typedef ne_session HttpSession;
|
||||
typedef ne_status HttpStatus;
|
||||
|
|
54
ucb/source/ucp/webdav/warnings_guard_ne_locks.h
Normal file
54
ucb/source/ucp/webdav/warnings_guard_ne_locks.h
Normal file
|
@ -0,0 +1,54 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License or as specified alternatively below. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* Major Contributor(s):
|
||||
* [ Copyright (C) 2011 Eike Rathke <erack@redhat.com> (initial developer) ]
|
||||
*
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* For minor contributions see the git repository.
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
|
||||
* the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
|
||||
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
|
||||
* instead of those above.
|
||||
*/
|
||||
|
||||
#ifndef INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
|
||||
#define INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
|
||||
|
||||
// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation
|
||||
// units and more important affects the rest of the current include file, the
|
||||
// warnings guard is separated into this header file on its own.
|
||||
|
||||
/*
|
||||
Silence down this WaE:
|
||||
/usr/include/neon/ne_locks.h:125:51: warning: 'int ne_lock(ne_session*, ne_lock*)'
|
||||
hides constructor for 'struct ne_lock' [-Wshadow]
|
||||
*/
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push, 1)
|
||||
#elif defined __GNUC__
|
||||
#pragma GCC system_header
|
||||
#endif
|
||||
#include <ne_locks.h>
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#endif // INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
Loading…
Reference in a new issue