Skip to content

feat: remove reference to _BCOM_SHARED macro #77

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions SolARFramework.pro
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ PROJECTCONFIG = QTVS
#NOTE : CONFIG as staticlib or sharedlib, DEPENDENCIESCONFIG as staticlib or sharedlib, QMAKE_TARGET.arch and PROJECTDEPLOYDIR MUST BE DEFINED BEFORE templatelibconfig.pri inclusion
include ($$shell_quote($$shell_path($${QMAKE_REMAKEN_RULES_ROOT}/templatelibconfig.pri))) # Shell_quote & shell_path required for visual on windows

msvc {
DEFINES += "_BCOM_SHARED=__declspec(dllexport)"
}

include (SolARFramework.pri)

# DEFINES += XPCF_DISABLE_ATTRIBUTES
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/features/ICornerRefinement.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_ICORNERREFINEMENT_H
#define SOLAR_ICORNERREFINEMENT_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <vector>
#include "core/Messages.h"
#include "datastructure/Image.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/features/IDescriptorMatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_IDESCRIPTORMATCHER_H
#define SOLAR_IDESCRIPTORMATCHER_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <vector>
#include "datastructure/DescriptorBuffer.h"
#include "datastructure/DescriptorMatch.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/features/IDescriptorMatcherGeometric.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_IDESCRIPTORMATCHERGEOMETRIC_H
#define SOLAR_IDESCRIPTORMATCHERGEOMETRIC_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <vector>
#include "datastructure/DescriptorBuffer.h"
#include "datastructure/DescriptorMatch.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/features/IDescriptorMatcherRegion.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_IDESCRIPTORMATCHERREGION_H
#define SOLAR_IDESCRIPTORMATCHERREGION_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <vector>
#include "datastructure/DescriptorBuffer.h"
#include "datastructure/DescriptorMatch.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/features/IDescriptorsExtractor.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_IDESCRIPTORSEXTRACTOR_H
#define SOLAR_IDESCRIPTORSEXTRACTOR_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <vector>
#include "datastructure/Keypoint.h"
//#include "IDescriptor.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/features/IDescriptorsExtractorFromImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef IDescriptorsExtractorFromImageFROMIMAGE_H
#define IDescriptorsExtractorFromImageFROMIMAGE_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <vector>
#include "datastructure/Keypoint.h"
#include "datastructure/Image.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/features/IKeypointDetector.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_IKEYPOINTDETECTOR_H
#define SOLAR_IKEYPOINTDETECTOR_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <memory>
#include <vector>

Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/features/IKeypointDetectorRegion.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_IKEYPOINTDETECTORREGION_H
#define SOLAR_IKEYPOINTDETECTORREGION_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <memory>
#include <vector>

Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/sink/ISinkPoseImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_ISINKPOSEIMAGE_H
#define SOLAR_ISINKPOSEIMAGE_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <xpcf/api/IComponentIntrospect.h>
#include <xpcf/core/helpers.h>
#include "ISinkReturnCode.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/sink/ISinkPoseTextureBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_ISINKPOSETEXTUREBUFFER_H
#define SOLAR_ISINKPOSETEXTUREBUFFER_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <xpcf/api/IComponentIntrospect.h>
#include <xpcf/core/helpers.h>
#include "ISinkReturnCode.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/solver/map/IBundler.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#ifndef IBUNDLER_H
#define IBUNDLER_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED


// Definition of IMapFilter Class //
// part of SolAR namespace //
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/solver/map/IKeyframeSelector.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef IKEYFRAMESELECTOR_H
#define IKEYFRAMESELECTOR_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

// Definition of IMapFilter Class //
// part of SolAR namespace //

Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/solver/map/IMapFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef IMAPFILTER_H
#define IMAPFILTER_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

// Definition of IMapFilter Class //
// part of SolAR namespace //

Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/solver/map/IMapFusion.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef IMAPFUSION_H
#define IMAPFUSION_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif

#include <xpcf/api/IComponentIntrospect.h>
#include "core/Messages.h"
#include "datastructure/GeometryDefinitions.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/solver/map/IMapUpdate.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef IMAPUPDATE_H
#define IMAPUPDATE_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif

#include <xpcf/api/IComponentIntrospect.h>
#include <xpcf/core/helpers.h>
#include "core/Messages.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/solver/map/ITriangulator.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef ITRIANGULATOR_H
#define ITRIANGULATOR_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <xpcf/api/IComponentIntrospect.h>
#include <xpcf/core/helpers.h>
#include "core/Messages.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/source/ISourceImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_ISOURCEIMAGE_H
#define SOLAR_ISOURCEIMAGE_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <xpcf/api/IComponentIntrospect.h>
#include <xpcf/core/helpers.h>
#include "ISourceReturnCode.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/api/storage/IMapManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef IMAPMANAGER_H
#define IMAPMANAGER_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

// Definition of IMapManager Class //
// part of SolAR namespace //

Expand Down
4 changes: 0 additions & 4 deletions interfaces/base/features/ADescriptorMatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_ADESCRIPTORMATCHER_H
#define SOLAR_ADESCRIPTORMATCHER_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include "core/SolARFrameworkDefinitions.h"
#include <xpcf/component/ConfigurableBase.h>
#include "api/features/IDescriptorMatcher.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/base/features/ADescriptorMatcherGeometric.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_ADESCRIPTORMATCHERGEOMETRIC_H
#define SOLAR_ADESCRIPTORMATCHERGEOMETRIC_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include "core/SolARFrameworkDefinitions.h"
#include "api/features/IDescriptorMatcherGeometric.h"
#include <xpcf/component/ConfigurableBase.h>
Expand Down
4 changes: 0 additions & 4 deletions interfaces/base/features/ADescriptorMatcherRegion.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_ADESCRIPTORMATCHERREGION_H
#define SOLAR_ADESCRIPTORMATCHERREGION_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include "core/SolARFrameworkDefinitions.h"
#include "api/features/IDescriptorMatcherRegion.h"
#include <xpcf/component/ConfigurableBase.h>
Expand Down
4 changes: 0 additions & 4 deletions interfaces/base/features/ADescriptorMatcherStereo.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_ADESCRIPTORMATCHERSTEREO_H
#define SOLAR_ADESCRIPTORMATCHERSTEREO_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include "core/SolARFrameworkDefinitions.h"
#include "api/features/IDescriptorMatcherStereo.h"
#include <xpcf/component/ConfigurableBase.h>
Expand Down
4 changes: 0 additions & 4 deletions interfaces/base/geom/A2DPointsRectification.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_A2DPOINTSRECTIFICATION_H
#define SOLAR_A2DPOINTSRECTIFICATION_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include "core/SolARFrameworkDefinitions.h"
#include <xpcf/component/ConfigurableBase.h>
#include "api/geom/I2DPointsRectification.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/base/geom/AReprojectionStereo.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_AREPROJECTIONSTEREO_H
#define SOLAR_AREPROJECTIONSTEREO_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include "core/SolARFrameworkDefinitions.h"
#include <xpcf/component/ConfigurableBase.h>
#include "api/geom/IReprojectionStereo.h"
Expand Down
4 changes: 0 additions & 4 deletions interfaces/base/pipeline/AMappingPipeline.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_AMAPPINGPIPELINE_H
#define SOLAR_AMAPPINGPIPELINE_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include "core/SolARFrameworkDefinitions.h"
#include <xpcf/component/ConfigurableBase.h>
#include "api/pipeline/IMappingPipeline.h"
Expand Down
14 changes: 3 additions & 11 deletions interfaces/core/SolARFramework.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,17 @@
#ifndef SOLARFRAMEWORK_H
#define SOLARFRAMEWORK_H

#if _WIN32
#ifdef SolARFramework_API_DLLEXPORT
#define _BCOM_SHARED __declspec(dllexport)
#else //_BCOM_SHARED
#define _BCOM_SHARED __declspec(dllimport)
#endif //_BCOM_SHARED
#else //_WIN32
#define _BCOM_SHARED
#endif //_WIN32

#include <string>

#include "core/SolARFrameworkDefinitions.h"

#define _STR(x) #x
#define STR(X) _STR(x)

namespace SolAR {

/// \brief This method returns the version of the SolAR Framework
_BCOM_SHARED std::string getSolARFrameworkVersion();
SOLARFRAMEWORK_API std::string getSolARFrameworkVersion();

}

Expand Down
4 changes: 0 additions & 4 deletions interfaces/datastructure/CloudPoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_CLOUDPOINT_H
#define SOLAR_CLOUDPOINT_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <xpcf/api/IComponentIntrospect.h>
#include <core/SolARFrameworkDefinitions.h>
#include <datastructure/GeometryDefinitions.h>
Expand Down
4 changes: 0 additions & 4 deletions interfaces/datastructure/Keypoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_KEYPOINT_H
#define SOLAR_KEYPOINT_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <core/SolARFrameworkDefinitions.h>
#include <datastructure/GeometryDefinitions.h>
#include <core/SerializationDefinitions.h>
Expand Down
4 changes: 0 additions & 4 deletions interfaces/datastructure/Mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
#ifndef SOLAR_MESH_H
#define SOLAR_MESH_H

#ifndef _BCOM_SHARED
#define _BCOM_SHARED
#endif // _BCOM_SHARED

#include <xpcf/api/IComponentIntrospect.h>
#include <core/SolARFrameworkDefinitions.h>
#include <core/SerializationDefinitions.h>
Expand Down
2 changes: 1 addition & 1 deletion src/core/SolARFramework.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "core/SolARFramework.h"

_BCOM_SHARED std::string getSolARFrameworkVersion(){
SOLARFRAMEWORK_API std::string getSolARFrameworkVersion(){

return STR(APP_VERSION);
}