SourceFormat Enforcement

[thirdparty/squid.git] / include / SquidNew.h

diff --git a/include/SquidNew.h b/include/SquidNew.h
index 7434a486cb5f411e6b97e8aae4487b0cfc39f435..ecb49305c46e2cf4fbbf02ba04c312d76e3eed8a 100644 (file)
--- a/include/SquidNew.h
+++ b/include/SquidNew.h
@@ -1,39 +1,15 @@
 /*
- * $Id: SquidNew.h,v 1.1 2003/07/07 22:44:28 robertc Exp $
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
- * AUTHOR: Harvest Derived
- *
- * SQUID Web Proxy Cache          http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- *  Squid is the result of efforts by numerous individuals from
- *  the Internet community; see the CONTRIBUTORS file for full
- *  details.   Many organizations have provided support for Squid's
- *  development; see the SPONSORS file for full details.  Squid is
- *  Copyrighted (C) 2001 by the Regents of the University of
- *  California; see the COPYRIGHT file for full details.  Squid
- *  incorporates software developed and/or copyrighted by other
- *  sources; see the CREDITS file for full details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *  
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *  
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #ifndef SQUID_NEW_H
 #define SQUID_NEW_H
 
+#if !defined(__SUNPRO_CC) && !defined(__clang__)
 /* Any code using libstdc++ must have externally resolvable overloads
  * for void * operator new - which means in the .o for the binary,
  * or in a shared library. static libs don't propogate the symbol
@@ -41,13 +17,14 @@
  * for the extern version in squid
  */
 #include <new>
+
 _SQUID_EXTERNNEW_ void *operator new(size_t size) throw (std::bad_alloc)
 {
     return xmalloc(size);
 }
 _SQUID_EXTERNNEW_ void operator delete (void *address) throw()
 {
-    xfree (address);
+    xfree(address);
 }
 _SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc)
 {
@@ -55,6 +32,10 @@ _SQUID_EXTERNNEW_ void *operator new[] (size_t size) throw (std::bad_alloc)
 }
 _SQUID_EXTERNNEW_ void operator delete[] (void *address) throw()
 {
-    xfree (address);
+    xfree(address);
 }
+
+#endif /* !__SUNPRO_CC && !__clang__*/
+
 #endif /* SQUID_NEW_H */
+