diff options
Diffstat (limited to '')
-rw-r--r-- | src/stable/minicron.cpp | 2 | ||||
-rw-r--r-- | src/stable/random.h | 2 | ||||
-rw-r--r-- | src/stable/sharedcore.h | 2 | ||||
-rw-r--r-- | src/stable/string.cpp | 16 | ||||
-rw-r--r-- | src/stable/string.h | 4 |
5 files changed, 23 insertions, 3 deletions
diff --git a/src/stable/minicron.cpp b/src/stable/minicron.cpp index 2f7e868..9d98682 100644 --- a/src/stable/minicron.cpp +++ b/src/stable/minicron.cpp | |||
@@ -317,7 +317,7 @@ time_t Bu::MiniCron::TimerBasic::nextTime() | |||
317 | if( tLast == -1 ) | 317 | if( tLast == -1 ) |
318 | tLast = time( NULL ); | 318 | tLast = time( NULL ); |
319 | 319 | ||
320 | Bu::String::const_iterator i = sSpec.begin(); | 320 | Bu::String::const_iterator i = const_cast<const Bu::String &>(sSpec).begin(); |
321 | switch( lex( i ) ) | 321 | switch( lex( i ) ) |
322 | { | 322 | { |
323 | case tokDaily: | 323 | case tokDaily: |
diff --git a/src/stable/random.h b/src/stable/random.h index b02c9e5..6dc3b45 100644 --- a/src/stable/random.h +++ b/src/stable/random.h | |||
@@ -8,11 +8,11 @@ | |||
8 | #define BU_RANDOM_H | 8 | #define BU_RANDOM_H |
9 | 9 | ||
10 | #include "bu/singleton.h" | 10 | #include "bu/singleton.h" |
11 | #include "bu/randombase.h" | ||
11 | #include <stdint.h> | 12 | #include <stdint.h> |
12 | 13 | ||
13 | namespace Bu | 14 | namespace Bu |
14 | { | 15 | { |
15 | class RandomBase; | ||
16 | class Random : public Bu::Singleton<Bu::Random> | 16 | class Random : public Bu::Singleton<Bu::Random> |
17 | { | 17 | { |
18 | friend class Bu::Singleton<Bu::Random>; | 18 | friend class Bu::Singleton<Bu::Random>; |
diff --git a/src/stable/sharedcore.h b/src/stable/sharedcore.h index be60588..e79c3d6 100644 --- a/src/stable/sharedcore.h +++ b/src/stable/sharedcore.h | |||
@@ -104,7 +104,7 @@ namespace Bu | |||
104 | Shell clone() const | 104 | Shell clone() const |
105 | { | 105 | { |
106 | Shell s( dynamic_cast<const Shell &>(*this) ); | 106 | Shell s( dynamic_cast<const Shell &>(*this) ); |
107 | s._hardCopy(); | 107 | dynamic_cast<_SharedType &>(s)._hardCopy(); |
108 | return s; | 108 | return s; |
109 | } | 109 | } |
110 | 110 | ||
diff --git a/src/stable/string.cpp b/src/stable/string.cpp index bf3aac0..1ceaec1 100644 --- a/src/stable/string.cpp +++ b/src/stable/string.cpp | |||
@@ -173,6 +173,17 @@ Bu::String::String( const Bu::String::const_iterator &s, | |||
173 | append( s, e ); | 173 | append( s, e ); |
174 | } | 174 | } |
175 | 175 | ||
176 | Bu::String::String( const Bu::String::iterator &s ) | ||
177 | { | ||
178 | append( s ); | ||
179 | } | ||
180 | |||
181 | Bu::String::String( const Bu::String::iterator &s, | ||
182 | const Bu::String::iterator &e ) | ||
183 | { | ||
184 | append( s, e ); | ||
185 | } | ||
186 | |||
176 | Bu::String::~String() | 187 | Bu::String::~String() |
177 | { | 188 | { |
178 | } | 189 | } |
@@ -317,6 +328,11 @@ void Bu::String::append( const const_iterator &s, const const_iterator &e ) | |||
317 | } | 328 | } |
318 | } | 329 | } |
319 | 330 | ||
331 | void Bu::String::append( const iterator &s, const iterator &e ) | ||
332 | { | ||
333 | append( const_iterator( s ), const_iterator( e ) ); | ||
334 | } | ||
335 | |||
320 | void Bu::String::prepend( const String & sData ) | 336 | void Bu::String::prepend( const String & sData ) |
321 | { | 337 | { |
322 | prepend( sData.getStr(), sData.getSize() ); | 338 | prepend( sData.getStr(), sData.getSize() ); |
diff --git a/src/stable/string.h b/src/stable/string.h index 3f8452d..bd1fe6c 100644 --- a/src/stable/string.h +++ b/src/stable/string.h | |||
@@ -569,6 +569,8 @@ namespace Bu | |||
569 | String( long nSize ); | 569 | String( long nSize ); |
570 | String( const const_iterator &s ); | 570 | String( const const_iterator &s ); |
571 | String( const const_iterator &s, const const_iterator &e ); | 571 | String( const const_iterator &s, const const_iterator &e ); |
572 | String( const iterator &s ); | ||
573 | String( const iterator &s, const iterator &e ); | ||
572 | virtual ~String(); | 574 | virtual ~String(); |
573 | 575 | ||
574 | /** | 576 | /** |
@@ -646,6 +648,8 @@ namespace Bu | |||
646 | */ | 648 | */ |
647 | void append( const const_iterator &s, const const_iterator &e ); | 649 | void append( const const_iterator &s, const const_iterator &e ); |
648 | 650 | ||
651 | void append( const iterator &s, const iterator &e ); | ||
652 | |||
649 | /** | 653 | /** |
650 | * Prepend another String to this one. | 654 | * Prepend another String to this one. |
651 | *@param sData (String &) The String to prepend. | 655 | *@param sData (String &) The String to prepend. |