[brlcad-commits] SF.net SVN: brlcad:[50987] brlcad/trunk/src/other/step/src/clutils
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Menu
▾
▴
[brlcad-commits] SF.net SVN: brlcad:[50987] brlcad/trunk/src/other/step/src/clutils
|
From: <n_...@us...> - 2012-06-07 16:13:53
|
Revision: 50987
http://brlcad.svn.sourceforge.net/brlcad/?rev=50987&view=rev
Author: n_reed
Date: 2012-06-07 16:13:46 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
add dll export symbols to clutils; SCL git 457d51e
Modified Paths:
--------------
brlcad/trunk/src/other/step/src/clutils/CMakeLists.txt
brlcad/trunk/src/other/step/src/clutils/Str.h
brlcad/trunk/src/other/step/src/clutils/dirobj.h
brlcad/trunk/src/other/step/src/clutils/errordesc.h
brlcad/trunk/src/other/step/src/clutils/gennode.h
brlcad/trunk/src/other/step/src/clutils/gennodearray.h
brlcad/trunk/src/other/step/src/clutils/gennodelist.h
brlcad/trunk/src/other/step/src/clutils/scl_hash.h
Modified: brlcad/trunk/src/other/step/src/clutils/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/step/src/clutils/CMakeLists.txt 2012-06-07 15:45:47 UTC (rev 50986)
+++ brlcad/trunk/src/other/step/src/clutils/CMakeLists.txt 2012-06-07 16:13:46 UTC (rev 50987)
@@ -26,4 +26,9 @@
${CMAKE_CURRENT_SOURCE_DIR}
)
+if (MSVC OR BORLAND)
+add_definitions( -DSCL_BASE_DLL_IMPORTS )
+add_definitions( -DSCL_UTILS_DLL_EXPORTS )
+endif()
+
SCL_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "")
Modified: brlcad/trunk/src/other/step/src/clutils/Str.h
===================================================================
--- brlcad/trunk/src/other/step/src/clutils/Str.h 2012-06-07 15:45:47 UTC (rev 50986)
+++ brlcad/trunk/src/other/step/src/clutils/Str.h 2012-06-07 16:13:46 UTC (rev 50987)
@@ -13,6 +13,7 @@
* and is not subject to copyright.
*/
+#include <scl_export.h>
#include <ctype.h>
//#include <std.h> // not found in CenterLine C++
@@ -28,21 +29,21 @@
#define STRING_DELIM '\''
#endif
-char ToLower( const char c );
-char ToUpper( const char c );
-char * StrToLower( const char *, char * );
-const char * StrToLower( const char * word, std::string & s );
-const char * StrToUpper( const char * word, std::string & s );
-const char * StrToConstant( const char * word, std::string & s );
-int StrCmpIns( const char * str1, const char * str2 );
-bool StrEndsWith( const std::string &s, const char * suffix );
-std::string GetLiteralStr( istream & in, ErrorDescriptor * err );
-const char * PrettyTmpName( const char * oldname );
-char * PrettyNewName( const char * oldname );
-int StrCmpIns( const char *, const char * );
-char * EntityClassName( char * oldname );
+SCL_UTILS_EXPORT char ToLower( const char c );
+SCL_UTILS_EXPORT char ToUpper( const char c );
+SCL_UTILS_EXPORT char * StrToLower( const char *, char * );
+SCL_UTILS_EXPORT const char * StrToLower( const char * word, std::string & s );
+SCL_UTILS_EXPORT const char * StrToUpper( const char * word, std::string & s );
+SCL_UTILS_EXPORT const char * StrToConstant( const char * word, std::string & s );
+SCL_UTILS_EXPORT int StrCmpIns( const char *str1, const char *str2 );
+SCL_UTILS_EXPORT const char * PrettyTmpName( const char * oldname );
+SCL_UTILS_EXPORT char * PrettyNewName( const char * oldname );
+SCL_UTILS_EXPORT char * EntityClassName( char * oldname );
-extern Severity CheckRemainingInput
+SCL_UTILS_EXPORT bool StrEndsWith( const std::string &s, const char * suffix );
+SCL_UTILS_EXPORT std::string GetLiteralStr( istream & in, ErrorDescriptor * err );
+
+extern SCL_UTILS_EXPORT Severity CheckRemainingInput
( istream & in, ErrorDescriptor * err,
const char * typeName, // used in error message
const char * tokenList ); // e.g. ",)"
Modified: brlcad/trunk/src/other/step/src/clutils/dirobj.h
===================================================================
--- brlcad/trunk/src/other/step/src/clutils/dirobj.h 2012-06-07 15:45:47 UTC (rev 50986)
+++ brlcad/trunk/src/other/step/src/clutils/dirobj.h 2012-06-07 16:13:46 UTC (rev 50987)
@@ -34,6 +34,7 @@
///////////////////////////////////////////////////////////////////////////////
#include <scl_cf.h>
+#include <scl_export.h>
#include <stdlib.h>
#include <string.h>
@@ -46,7 +47,7 @@
/*****************************************************************************/
-class DirObj {
+class SCL_UTILS_EXPORT DirObj {
public:
DirObj( const char * dirName );
virtual ~DirObj();
Modified: brlcad/trunk/src/other/step/src/clutils/errordesc.h
===================================================================
--- brlcad/trunk/src/other/step/src/clutils/errordesc.h 2012-06-07 15:45:47 UTC (rev 50986)
+++ brlcad/trunk/src/other/step/src/clutils/errordesc.h 2012-06-07 16:13:46 UTC (rev 50987)
@@ -13,6 +13,7 @@
* and is not subject to copyright.
*/
+#include <scl_export.h>
#include <string>
#include <iostream>
using namespace std;
@@ -55,7 +56,7 @@
** Status:
******************************************************************/
-class ErrorDescriptor {
+class SCL_UTILS_EXPORT ErrorDescriptor {
private:
std::string _userMsg, _detailMsg;
protected:
Modified: brlcad/trunk/src/other/step/src/clutils/gennode.h
===================================================================
--- brlcad/trunk/src/other/step/src/clutils/gennode.h 2012-06-07 15:45:47 UTC (rev 50986)
+++ brlcad/trunk/src/other/step/src/clutils/gennode.h 2012-06-07 16:13:46 UTC (rev 50987)
@@ -15,8 +15,9 @@
/* $Id: gennode.h,v 3.0.1.3 1997/11/05 22:33:47 sauderd DP3.1 $ */
+#include <scl_export.h>
+#include <iostream>
-#include <iostream>
class GenNodeList;
class MgrNodeList;
class DisplayNodeList;
@@ -26,7 +27,7 @@
// If you delete this object it first removes itself from any list it is in.
//////////////////////////////////////////////////////////////////////////////
-class GenericNode {
+class SCL_UTILS_EXPORT GenericNode {
friend class GenNodeList;
friend class MgrNodeList;
friend class DisplayNodeList;
Modified: brlcad/trunk/src/other/step/src/clutils/gennodearray.h
===================================================================
--- brlcad/trunk/src/other/step/src/clutils/gennodearray.h 2012-06-07 15:45:47 UTC (rev 50986)
+++ brlcad/trunk/src/other/step/src/clutils/gennodearray.h 2012-06-07 16:13:46 UTC (rev 50987)
@@ -21,7 +21,7 @@
* Copyright (c) 1990 Stanford University
*/
-
+#include <scl_export.h>
#include <string.h>
#include <memory.h>
#include <stdlib.h> // to get bcopy for CenterLine
@@ -38,7 +38,7 @@
// DeleteEntries().
//////////////////////////////////////////////////////////////////////////////
-class GenNodeArray {
+class SCL_UTILS_EXPORT GenNodeArray {
public:
GenNodeArray( int defaultSize = ARRAY_DEFAULT_SIZE );
Modified: brlcad/trunk/src/other/step/src/clutils/gennodelist.h
===================================================================
--- brlcad/trunk/src/other/step/src/clutils/gennodelist.h 2012-06-07 15:45:47 UTC (rev 50986)
+++ brlcad/trunk/src/other/step/src/clutils/gennodelist.h 2012-06-07 16:13:46 UTC (rev 50987)
@@ -15,7 +15,7 @@
/* $Id: gennodelist.h,v 3.0.1.2 1997/11/05 22:33:48 sauderd DP3.1 $ */
-
+#include <scl_export.h>
#include <iostream>
//////////////////////////////////////////////////////////////////////////////
@@ -26,7 +26,7 @@
// as its head, you need to call DeleteEntries().
//////////////////////////////////////////////////////////////////////////////
-class GenNodeList {
+class SCL_UTILS_EXPORT GenNodeList {
public:
GenNodeList( GenericNode * headNode );
virtual ~GenNodeList() {
Modified: brlcad/trunk/src/other/step/src/clutils/scl_hash.h
===================================================================
--- brlcad/trunk/src/other/step/src/clutils/scl_hash.h 2012-06-07 15:45:47 UTC (rev 50986)
+++ brlcad/trunk/src/other/step/src/clutils/scl_hash.h 2012-06-07 16:13:46 UTC (rev 50987)
@@ -91,6 +91,8 @@
*
*/
+#include <scl_export.h>
+
typedef enum { HASH_FIND, HASH_INSERT, HASH_DELETE } Action;
struct Element {
@@ -130,14 +132,15 @@
extern "C" {
#endif
- struct Hash_Table * HASHcreate( unsigned );
- void * HASHfind( struct Hash_Table *, char * );
- void HASHinsert( struct Hash_Table *, char *, void * );
- void HASHdestroy( struct Hash_Table * );
- struct Element * HASHsearch( struct Hash_Table *, const struct Element *, Action );
- void HASHlistinit( struct Hash_Table *, HashEntry * );
- void HASHlistinit_by_type( struct Hash_Table *, HashEntry *, char );
- struct Element * HASHlist( HashEntry * );
+ SCL_UTILS_EXPORT struct Hash_Table * HASHcreate( unsigned );
+ SCL_UTILS_EXPORT void HASHinitialize( void );
+ SCL_UTILS_EXPORT void * HASHfind( struct Hash_Table *, char * );
+ SCL_UTILS_EXPORT void HASHinsert( struct Hash_Table *, char *, void * );
+ SCL_UTILS_EXPORT void HASHdestroy( struct Hash_Table * );
+ SCL_UTILS_EXPORT struct Element * HASHsearch( struct Hash_Table *, const struct Element *, Action );
+ SCL_UTILS_EXPORT void HASHlistinit( struct Hash_Table *, HashEntry * );
+ SCL_UTILS_EXPORT void HASHlistinit_by_type( struct Hash_Table *, HashEntry *, char );
+ SCL_UTILS_EXPORT struct Element * HASHlist( HashEntry * );
#ifdef __cplusplus
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|