Menu
▾
▴
[fU-cvs] libfunutil/lib/toolbox/src any.h,1.1,1.2 argv_parser.h,1.1,1.2 bzstream.h,1.1,1.2 children_holder.h,1.1,1.2 eprintf.h,1.1,1.2 file_util.h,1.1,1.2 gzstream.h,1.1,1.2 key_value_parser.h,1.1,1.2 pointer_list.h,1.1,1.2 property_store.h,1.1,1.2 stdstring_tokenizer.h,1.1,1.2 string_tokenizer.h,1.1,1.2 string_util.h,1.1,1.2 to_string.h,1.1,1.2 type_traits.h,1.1,1.2
|
From: <sg...@us...> - 2003-11-29 13:47:16
|
Update of /cvsroot/libfunutil/libfunutil/lib/toolbox/src
In directory sc8-pr-cvs1:/tmp/cvs-serv20162/toolbox/src
Modified Files:
any.h argv_parser.h bzstream.h children_holder.h eprintf.h
file_util.h gzstream.h key_value_parser.h pointer_list.h
property_store.h stdstring_tokenizer.h string_tokenizer.h
string_util.h to_string.h type_traits.h
Log Message:
namespace-related fixes, to allow compilation with lib code from two diff namespaces in the same client code.
Index: any.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/any.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- any.h 28 Nov 2003 00:56:03 -0000 1.1
+++ any.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef TOOLBOX_ANY_H_INCLUDED
-#define TOOLBOX_ANY_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_ANY_H_INCLUDED
+#define TOOLBOX_NAMESPACE_ANY_H_INCLUDED 1
// License: Public Domain
// Author: st...@wa...
@@ -167,4 +167,4 @@
} // namespace
-#endif // TOOLBOX_ANY_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_ANY_H_INCLUDED
Index: argv_parser.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/argv_parser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- argv_parser.h 28 Nov 2003 00:56:03 -0000 1.1
+++ argv_parser.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef ARGV_PARSER_H
-#define ARGV_PARSER_H 1
+#ifndef TOOLBOX_NAMESPACE_ARGV_PARSER_H
+#define TOOLBOX_NAMESPACE_ARGV_PARSER_H 1
// Author: st...@wa...
// License: Public Domain
@@ -311,4 +311,4 @@
property_store helpmap;
};
}; // namespace TOOLBOX_NAMESPACE
-#endif // ARGV_PARSER_H
+#endif // TOOLBOX_NAMESPACE_ARGV_PARSER_H
Index: bzstream.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/bzstream.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bzstream.h 28 Nov 2003 00:56:03 -0000 1.1
+++ bzstream.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -35,8 +35,8 @@
// - added zlevel() to gzstreambase and gzstreambuf. Only works for ostreams.
// - replaced gzip code with bzip code.
-#ifndef BZSTREAM_H_INCLUDED
-#define BZSTREAM_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_BZSTREAM_H_INCLUDED
+#define TOOLBOX_NAMESPACE_BZSTREAM_H_INCLUDED 1
// standard C++ with new header file names and std:: namespace
@@ -199,6 +199,6 @@
} // namespace ZSTREAM_NAMESPACE
#endif
-#endif // BZSTREAM_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_BZSTREAM_H_INCLUDED
// ============================================================================
// EOF //
Index: children_holder.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/children_holder.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- children_holder.h 28 Nov 2003 00:56:03 -0000 1.1
+++ children_holder.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,7 +1,7 @@
// Author: stephan beal <st...@s1...>
// License: Public Domain
-#ifndef CHILDRENHOLDER_H_INCLUDED
-#define CHILDRENHOLDER_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_CHILDRENHOLDER_H_INCLUDED
+#define TOOLBOX_NAMESPACE_CHILDRENHOLDER_H_INCLUDED 1
#include <string>
#include <list>
@@ -179,4 +179,4 @@
}; // namespace TOOLBOX_NAMESPACE
-#endif // CHILDRENHOLDER_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_CHILDRENHOLDER_H_INCLUDED
Index: eprintf.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/eprintf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- eprintf.h 28 Nov 2003 00:56:03 -0000 1.1
+++ eprintf.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef EPRINTF_H_INCLUDED
-#define EPRINTF_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_EPRINTF_H_INCLUDED
+#define TOOLBOX_NAMESPACE_EPRINTF_H_INCLUDED 1
// License: Public Domain
// Author: st...@wa...
#include <iostream>
@@ -94,5 +94,5 @@
#include "eprintf_impl.h"
-}; // namespace TOOLBOX_NAMESPACE
-#endif // EPRINTF_H_INCLUDED
+} // namespace TOOLBOX_NAMESPACE
+#endif // TOOLBOX_NAMESPACE_EPRINTF_H_INCLUDED
Index: file_util.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/file_util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- file_util.h 28 Nov 2003 00:56:03 -0000 1.1
+++ file_util.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef TOOLKIT_FILE_UTIL_H_INCLUDED
-#define TOOLKIT_FILE_UTIL_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_FILE_UTIL_H_INCLUDED
+#define TOOLBOX_NAMESPACE_FILE_UTIL_H_INCLUDED 1
#include <string>
@@ -115,4 +115,4 @@
}; // namespace TOOLBOX_NAMESPACE
-#endif // TOOLKIT_FILE_UTIL_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_FILE_UTIL_H_INCLUDED
Index: gzstream.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/gzstream.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gzstream.h 28 Nov 2003 00:56:03 -0000 1.1
+++ gzstream.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -30,8 +30,8 @@
// October, 2003:
// - added zlevel() to gzstreambase and gzstreambuf. Only works for ostreams.
-#ifndef GZSTREAM_H_INCLUDED
-#define GZSTREAM_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_GZSTREAM_H_INCLUDED
+#define TOOLBOX_NAMESPACE_GZSTREAM_H_INCLUDED 1
// standard C++ with new header file names and std:: namespace
@@ -185,6 +185,6 @@
} // namespace ZSTREAM_NAMESPACE
#endif
-#endif // GZSTREAM_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_GZSTREAM_H_INCLUDED
// ============================================================================
// EOF //
Index: key_value_parser.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/key_value_parser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- key_value_parser.h 28 Nov 2003 00:56:03 -0000 1.1
+++ key_value_parser.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,7 +1,7 @@
// Author: stephan beal <st...@s1...>
// License: Public Domain
-#ifndef SGB_KEYVALUEPARSER_H
-#define SGB_KEYVALUEPARSER_H
+#ifndef TOOLBOX_NAMESPACE_KEYVALUEPARSER_H
+#define TOOLBOX_NAMESPACE_KEYVALUEPARSER_H
#include <string>
#include <map>
@@ -119,4 +119,4 @@
std::ostream & operator <<( std::ostream & os, const key_value_parser & );
}; // namespace TOOLBOX_NAMESPACE
-#endif // SGB_KEYVALUEPARSER_H
+#endif // TOOLBOX_NAMESPACE_KEYVALUEPARSER_H
Index: pointer_list.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/pointer_list.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pointer_list.h 28 Nov 2003 00:56:03 -0000 1.1
+++ pointer_list.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,7 +1,7 @@
// Author: stephan beal <st...@s1...>
// License: Public Domain
-#ifndef POINTERLIST_H_INCLUDED
-#define POINTERLIST_H_INCLUDED
+#ifndef TOOLBOX_NAMESPACE_POINTERLIST_H_INCLUDED
+#define TOOLBOX_NAMESPACE_POINTERLIST_H_INCLUDED
#include <string>
#include <list>
#include <map>
@@ -411,4 +411,4 @@
return el;
}
-#endif // POINTERLIST_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_POINTERLIST_H_INCLUDED
Index: property_store.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/property_store.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- property_store.h 28 Nov 2003 00:56:03 -0000 1.1
+++ property_store.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,7 +1,7 @@
// Author: stephan beal <st...@s1...>
// License: Public Domain
-#ifndef LIBE_PROPERTIESPROVIDER_H
-#define LIBE_PROPERTIESPROVIDER_H
+#ifndef TOOLBOX_NAMESPACE_PROPERTIESPROVIDER_H
+#define TOOLBOX_NAMESPACE_PROPERTIESPROVIDER_H
#include <iostream>
#include <map>
@@ -327,4 +327,4 @@
}; // namespace TOOLBOX_NAMESPACE
-#endif // LIBE_PROPERTIESPROVIDER_H
+#endif // TOOLBOX_NAMESPACE_PROPERTIESPROVIDER_H
Index: stdstring_tokenizer.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/stdstring_tokenizer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stdstring_tokenizer.h 28 Nov 2003 00:56:03 -0000 1.1
+++ stdstring_tokenizer.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,7 +1,7 @@
// Author: stephan beal <st...@s1...>
// License: Public Domain
-#ifndef ESTDSTRINGTOKENIZER_H
-#define ESTDSTRINGTOKENIZER_H
+#ifndef TOOLBOX_NAMESPACE_STDSTRINGTOKENIZER_H
+#define TOOLBOX_NAMESPACE_STDSTRINGTOKENIZER_H
#include <string>
#include <queue>
@@ -81,4 +81,4 @@
};
}; // namespace TOOLBOX_NAMESPACE
-#endif // ESTDSTRINGTOKENIZER_H
+#endif // TOOLBOX_NAMESPACE_STDSTRINGTOKENIZER_H
Index: string_tokenizer.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/string_tokenizer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- string_tokenizer.h 28 Nov 2003 00:56:03 -0000 1.1
+++ string_tokenizer.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef STRINGTOKENIZER_H
-#define STRINGTOKENIZER_H
+#ifndef TOOLBOX_NAMESPACE_STRINGTOKENIZER_H
+#define TOOLBOX_NAMESPACE_STRINGTOKENIZER_H
namespace TOOLBOX_NAMESPACE {
@@ -63,5 +63,5 @@
};
}; // namespace TOOLBOX_NAMESPACE
-#endif // STRINGTOKENIZER_H
+#endif // TOOLBOX_NAMESPACE_STRINGTOKENIZER_H
Index: string_util.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/string_util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- string_util.h 28 Nov 2003 00:56:03 -0000 1.1
+++ string_util.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef ELIB_STRING_H_INCLUDED
-#define ELIB_STRING_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_STRING_H_INCLUDED
+#define TOOLBOX_NAMESPACE_STRING_H_INCLUDED 1
#include <string>
#include <map>
@@ -136,4 +136,4 @@
} // namespace TOOLBOX_NAMESPACE
-#endif // ELIB_STRING_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_STRING_H_INCLUDED
Index: to_string.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/to_string.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- to_string.h 28 Nov 2003 00:56:03 -0000 1.1
+++ to_string.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef SGB_TO_STRING_H_INCLUDED
-#define SGB_TO_STRING_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_TO_STRING_H_INCLUDED
+#define TOOLBOX_NAMESPACE_TO_STRING_H_INCLUDED 1
// Author: stephan beal <st...@s1...>
// License: Public Domain
@@ -109,5 +109,5 @@
}; // namespace TOOLBOX_NAMESPACE
-#endif // SGB_TO_STRING_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_TO_STRING_H_INCLUDED
Index: type_traits.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/toolbox/src/type_traits.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- type_traits.h 28 Nov 2003 00:56:03 -0000 1.1
+++ type_traits.h 29 Nov 2003 13:47:13 -0000 1.2
@@ -1,5 +1,5 @@
-#ifndef TYPE_TRAITS_H_INCLUDED
-#define TYPE_TRAITS_H_INCLUDED 1
+#ifndef TOOLBOX_NAMESPACE_TYPE_TRAITS_H_INCLUDED
+#define TOOLBOX_NAMESPACE_TYPE_TRAITS_H_INCLUDED 1
// License: Do As You Damned Well Please
// Author: st...@wa...
@@ -50,4 +50,4 @@
} // namespace
-#endif // TYPE_TRAITS_H_INCLUDED
+#endif // TOOLBOX_NAMESPACE_TYPE_TRAITS_H_INCLUDED
|
