Undo bad merge from trunk - merged at wrong level.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 39 deletions

diff --git a/cpp/src/qpid/DisableExceptionLogging.h b/cpp/src/qpid/DisableExceptionLogging.h
deleted file mode 100644
index 04a9240513..0000000000
--- a/cpp/src/qpid/DisableExceptionLogging.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef QPID_DISABLEEXCEPTIONLOGGING_H
-#define QPID_DISABLEEXCEPTIONLOGGING_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include "qpid/CommonImportExport.h"
-
-namespace qpid {
-
-/**
- * Temporarily disable logging in qpid::Exception constructor.
- * Used by log::Logger to avoid logging exceptions during Logger construction.
- */
-struct DisableExceptionLogging
-{
-    QPID_COMMON_EXTERN DisableExceptionLogging();
-    QPID_COMMON_EXTERN ~DisableExceptionLogging();
-};
-} // namespace qpid
-
-#endif  /*!QPID_DISABLEEXCEPTIONLOGGING_H*/