Skip to content
Snippets Groups Projects
Commit 430e273b authored by Rene Brun's avatar Rene Brun
Browse files

From Axel:

Fix error pos for string, deque dll now that CINT actually parses them
because __SUNPRO_CC is now defined for makecint.


git-svn-id: http://root.cern.ch/svn/root/trunk@16979 27541ba8-7e3a-0410-8455-c3a389f83636
parent e0076e80
No related branches found
No related tags found
No related merge requests found
...@@ -8,12 +8,16 @@ ...@@ -8,12 +8,16 @@
#ifndef G__SUNCC5_DEQUE_H #ifndef G__SUNCC5_DEQUE_H
#define G__SUNCC5_DEQUE_H #define G__SUNCC5_DEQUE_H
#ifdef __CINT__
#define _RWSTDExport
#endif
#if (__SUNPRO_CC>=1280) #if (__SUNPRO_CC>=1280)
namespace __rwstd { namespace __rwstd {
#ifdef _RWSTD_LOCALIZED_ERRORS #ifdef _RWSTD_LOCALIZED_ERRORS
const unsigned int _RWSTDExport rwse_OutOfRange = 0; const unsigned int _RWSTDExport rwse_OutOfRange = 0;
#else #else
const char _RWSTDExportFunc(*) rwse_OutOfRange = 0; const char * rwse_OutOfRange = 0;
#endif // _RWSTD_LOCALIZED_ERRORS #endif // _RWSTD_LOCALIZED_ERRORS
} }
#endif #endif
......
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
#ifndef G__SUNCC5_STRING_H #ifndef G__SUNCC5_STRING_H
#define G__SUNCC5_STRING_H #define G__SUNCC5_STRING_H
#ifdef __CINT__
#define _RWSTDExport
#endif
#if (__SUNPRO_CC>=1280) #if (__SUNPRO_CC>=1280)
//#define _RWSTD_COMPILE_INSTANTIATE //#define _RWSTD_COMPILE_INSTANTIATE
namespace __rwstd { namespace __rwstd {
...@@ -18,11 +22,11 @@ namespace __rwstd { ...@@ -18,11 +22,11 @@ namespace __rwstd {
const unsigned int _RWSTDExport __rwse_StringIndexOutOfRange=0; const unsigned int _RWSTDExport __rwse_StringIndexOutOfRange=0;
const unsigned int _RWSTDExport __rwse_UnexpectedNullPtr=0; const unsigned int _RWSTDExport __rwse_UnexpectedNullPtr=0;
#else #else
const char _RWSTDExportFunc(*) __rwse_InvalidSizeParam=0; const char * __rwse_InvalidSizeParam=0;
const char _RWSTDExportFunc(*) __rwse_PosBeyondEndOfString=0; const char * __rwse_PosBeyondEndOfString=0;
const char _RWSTDExportFunc(*) __rwse_ResultLenInvalid=0; const char * __rwse_ResultLenInvalid=0;
const char _RWSTDExportFunc(*) __rwse_StringIndexOutOfRange=0; const char * __rwse_StringIndexOutOfRange=0;
const char _RWSTDExportFunc(*) __rwse_UnexpectedNullPtr=0; const char * __rwse_UnexpectedNullPtr=0;
#endif #endif
} }
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment