Subject: |
[Merge] ~info-martin-konrad/epics-base:retire-epicsexcept into epics-base:3.15 |
From: |
Martin Konrad via Core-talk <[email protected]> |
To: |
[email protected] |
Date: |
Tue, 12 Nov 2019 17:20:38 -0000 |
Martin Konrad has proposed merging ~info-martin-konrad/epics-base:retire-epicsexcept into epics-base:3.15.
Requested reviews:
EPICS Core Developers (epics-core)
For more details, see:
https://code.launchpad.net/~info-martin-konrad/epics-base/+git/epics-base/+merge/375446
No impact on users. Let's merge this into 3.15 and 7.0.
--
Your team EPICS Core Developers is requested to review the proposed merge of ~info-martin-konrad/epics-base:retire-epicsexcept into epics-base:3.15.
diff --git a/src/libCom/cppStd/Makefile b/src/libCom/cppStd/Makefile
index 989b87e..23834e7 100644
--- a/src/libCom/cppStd/Makefile
+++ b/src/libCom/cppStd/Makefile
@@ -9,6 +9,5 @@
SRC_DIRS += $(LIBCOM)/cppStd
INC += epicsAlgorithm.h
-INC += epicsExcept.h
INC += epicsMemory.h
diff --git a/src/libCom/cppStd/epicsExcept.h b/src/libCom/cppStd/epicsExcept.h
deleted file mode 100644
index e689997..0000000
--- a/src/libCom/cppStd/epicsExcept.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-* National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-* Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
-\*************************************************************************/
-// Author: Andrew Johnson & Jeff Hill
-// Date: December 2000
-
-#ifndef __EPICS_EXCEPT_H__
-#define __EPICS_EXCEPT_H__
-
-#define epicsThrowHere(exc) \
- throw locationException(exc, __FILE__, __LINE__)
-
-class sourceLocation {
-public: // Functions
- sourceLocation(const char *fileName, int lineNumber);
-// sourceLocation(const sourceLocation&); Copy constructable
-// sourceLocation& operator=(const sourceLocation&); Assignable
-
- const char *fileName() const;
- int lineNumber() const;
-
-private: // Hide compiler-generated member functions
- sourceLocation(); // default constructor
-
-private: // Data
- const char *file;
- int line;
-};
-
-template <class T>
-class locationException : public T, public sourceLocation {
-public:
- locationException(const T& exc, const char *fileName, int lineNumber);
-};
-
-
-/* Example:
- * if (status) epicsThrowHere(std::logic_error("operation failed!"));
- * try { ... } catch(sourceLocation& where) { ... }
- */
-
-// END OF DECLARATIONS
-
-// INLINE FUNCTIONS
-
-// sourceFileLocation
-inline sourceLocation::sourceLocation (const char *fileName, int lineNumber) :
- file(fileName), line(lineNumber) {}
-
-inline const char* sourceLocation::fileName () const {
- return this->file;
-}
-
-inline int sourceLocation::lineNumber () const {
- return this->line;
-}
-
-// locationException<T>
-template <class T>
-inline locationException<T>::locationException
- (const char *fileName, int lineNumber, const E& exc) :
- T(exc), sourceLocation(fileName, lineNumber) {}
-
-
-#endif // __EPICS_EXCEPT_H__
- Replies:
- Re: [Merge] ~info-martin-konrad/epics-base:retire-epicsexcept into epics-base:3.15 mdavidsaver via Core-talk
- [Merge] ~info-martin-konrad/epics-base:retire-epicsexcept into epics-base:3.15 noreply--- via Core-talk
- Navigate by Date:
- Prev:
[Merge] ~info-martin-konrad/epics-base:remove-epicsthrows into epics-base:7.0 Martin Konrad via Core-talk
- Next:
[Merge] ~info-martin-konrad/epics-base:simplify-compiler-specific-macros into epics-base:3.15 Martin Konrad via Core-talk
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
<2019>
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
[Merge] ~info-martin-konrad/epics-base:remove-epicsthrows into epics-base:7.0 mdavidsaver via Core-talk
- Next:
Re: [Merge] ~info-martin-konrad/epics-base:retire-epicsexcept into epics-base:3.15 mdavidsaver via Core-talk
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
<2019>
2020
2021
2022
2023
2024
|