Skip to content

Review/msvc linker fixes #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpictor merged 4 commits into from
Dec 30, 2013
Merged

Review/msvc linker fixes #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46951e3
Added import/export macro's for STEPattribute operator==, operator!= …
davyw Dec 28, 2013
f43a106
Removed pure virtual operator= reference from SDAI_Select class.
davyw Dec 29, 2013
530c796
Added SC_SCHEMA_EXPORT macro for each generated entity class.
davyw Dec 29, 2013
02ef60a
Added DEFINE_DLL_IMPORTS to add_schema_dependent_test macro.
davyw Dec 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/clstepcore/STEPattribute.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,14 @@ bool operator == ( const STEPattribute & a1, const STEPattribute & a2 ) {
return false;
}

/** evaluate the equality of two attributes
* ignores _error and refCount, since those are ancillary
* \return true if not equal
*/
bool operator != ( const STEPattribute & a1, const STEPattribute & a2 ) {
return !( a1 == a2 );
}

/// return true if the attr descriptor is identical
bool sameADesc( const STEPattribute & a1, const STEPattribute & a2 ) {
return a1.aDesc == a2.aDesc;
Expand Down
8 changes: 3 additions & 5 deletions src/clstepcore/STEPattribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,11 @@ class SC_CORE_EXPORT STEPattribute {
STEPattribute( const class AttrDescriptor & d, SCLundefined * p );

/// return true if attr types and values match
friend bool operator == ( const STEPattribute & a1, const STEPattribute & a2 );
friend bool operator != ( const STEPattribute & a1, const STEPattribute & a2 ) {
return !( a1 == a2 );
}
SC_CORE_EXPORT friend bool operator == ( const STEPattribute & a1, const STEPattribute & a2 );
SC_CORE_EXPORT friend bool operator != ( const STEPattribute & a1, const STEPattribute & a2 );

/// return true if aDesc's match (behavior of old operator==)
friend bool sameADesc ( const STEPattribute & a1, const STEPattribute & a2 );
SC_CORE_EXPORT friend bool sameADesc ( const STEPattribute & a1, const STEPattribute & a2 );
};

#endif
2 changes: 0 additions & 2 deletions src/clstepcore/sdaiSelect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ class SC_CORE_EXPORT SDAI_Select {
int addFileId = 0,
const char * currSch = 0 ) = 0;

virtual SDAI_Select & operator =( const SDAI_Select & ) = 0;

int set_null();
int is_null();

Expand Down
2 changes: 1 addition & 1 deletion src/exp2cxx/classes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ void ENTITYhead_print( Entity entity, FILE * file ) {
strncpy( entnm, ENTITYget_classname( entity ), BUFSIZ );
entnm[BUFSIZ-1] = '\0';

fprintf( file, "\nclass %s : ", entnm );
fprintf( file, "\nclass SC_SCHEMA_EXPORT %s : ", entnm );

/* inherit from either supertype entity class or root class of
all - i.e. SDAI_Application_instance */
Expand Down
6 changes: 5 additions & 1 deletion test/cpp/schema_specific/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ FUNCTION( add_schema_dependent_test name sdai_lib exe_args )

add_executable( tst_${name} "${name}.cc" )
set_target_properties( tst_${name} PROPERTIES COMPILE_FLAGS "-I${sdai_src_path} ${ARGV3}" EXCLUDE_FROM_ALL ON )
if(NOT "${ARGV4}" MATCHES "NONE")
DEFINE_DLL_IMPORTS( "tst_${name}" "${ARGV4}" )
endif(NOT "${ARGV4}" MATCHES "NONE")
target_link_libraries( tst_${name} sdai_${sdai_lib} ${ARGV4} )
add_test( NAME build_cpp_${name}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
Expand All @@ -39,7 +42,8 @@ SET(SC_ENABLE_TESTING OFF)
SET(SC_ENABLE_TESTING ON)

add_schema_dependent_test( "aggregate_bound_runtime" "array_bounds_expr"
"${SC_SOURCE_DIR}/test/p21/test_array_bounds.p21" )
"${SC_SOURCE_DIR}/test/p21/test_array_bounds.p21"
"" "stepcore")

#can't use the macro for this one because it depends on the test above and needs WILL_FAIL
add_test( NAME test_aggregate_bound_runtime_FAIL1
Expand Down