Changeset 1764 for code/trunk/src/util
- Timestamp:
- Sep 10, 2008, 1:11:19 PM (16 years ago)
- Location:
- code/trunk/src/util
- Files:
-
- 1 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/util/CMakeLists.txt
r1755 r1764 3 3 Error.cc 4 4 CRC32.cc 5 Exception.cc 5 6 ExprParser.cc 6 7 Math.cc -
code/trunk/src/util/Exception.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/gui/src/core/Exception.cc merged eligible /code/branches/core3/src/core/Exception.cc 1572-1739 /code/branches/gcc43/src/core/Exception.cc 1580 /code/branches/input/src/core/Exception.cc 1629-1636
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
code/trunk/src/util/Exception.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/gui/src/core/Exception.h merged eligible /code/branches/core3/src/core/Exception.h 1572-1739 /code/branches/gcc43/src/core/Exception.h 1580 /code/branches/input/src/core/Exception.h 1629-1636
r1761 r1764 36 36 #define _Exception_H__ 37 37 38 #include " CorePrereqs.h"38 #include "UtilPrereqs.h" 39 39 40 40 #include <string> 41 41 #include <exception> 42 42 #include <cassert> 43 #include " util/Debug.h"43 #include "Debug.h" 44 44 45 45 // Define some ugly macros to make things more clear … … 52 52 namespace orxonox 53 53 { 54 class _ CoreExport Exception : public std::exception54 class _UtilExport Exception : public std::exception 55 55 { 56 56 public: -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.