Aufgrund einer Wartung wird GitLab am 21.09. zwischen 8:00 und 9:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 21.09. between 8:00 and 9:00 am.

Commit 4013d761 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Linux compat progress, linking

parent 48aebc4e
...@@ -24,6 +24,11 @@ if( ITA_VISTA_BUILD_STATIC ) ...@@ -24,6 +24,11 @@ if( ITA_VISTA_BUILD_STATIC )
add_definitions( -DVISTAINTERPROCCOMM_STATIC ) add_definitions( -DVISTAINTERPROCCOMM_STATIC )
endif( ITA_VISTA_BUILD_STATIC ) endif( ITA_VISTA_BUILD_STATIC )
if( NOT WIN32 )
add_definitions( -std=gnu++11 )
endif( )
# linker
add_library( VABase "${ProjectSources}" ) add_library( VABase "${ProjectSources}" )
target_link_libraries( VABase ${VISTA_USE_PACKAGE_LIBRARIES} ) target_link_libraries( VABase ${VISTA_USE_PACKAGE_LIBRARIES} )
......
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
#include <VABaseDefinitions.h> #include <VABaseDefinitions.h>
#include <VAStruct.h> #include <VAStruct.h>
// Forward declarations
class VABASE_API CVAStruct;
//! Base class for objects with identity and message interface //! Base class for objects with identity and message interface
/** /**
* In VA, anything can be an object and can be called via the module call interface during runtime. * In VA, anything can be an object and can be called via the module call interface during runtime.
......
...@@ -15,12 +15,15 @@ ...@@ -15,12 +15,15 @@
#define IW_VABASE_OBJECT_REGISTRY #define IW_VABASE_OBJECT_REGISTRY
#include <VABaseDefinitions.h> #include <VABaseDefinitions.h>
#include <VAObject.h> //#include <VAObject.h>
#include <VAStruct.h>
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
class CVAObject;
//! Registry class for objects //! Registry class for objects
/** /**
* *
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
// $Id: $ // $Id: $
#include <VAObjectRegistry.h> #include <VAObjectRegistry.h>
#include <VAObject.h>
#include <VAException.h> #include <VAException.h>
#include <VAObject.h>
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
......
...@@ -18,9 +18,9 @@ int main() { ...@@ -18,9 +18,9 @@ int main() {
CVAStruct s; CVAStruct s;
s["a"] = CVAStruct(); s["a"] = CVAStruct();
s["a"]["b"] = 24; s[string("a")][string("b")] = 24;
s["a"]["c"] = CVAStruct(); s[string("a")][string("c")] = CVAStruct();
s["a"]["c"]["d"] = "Hui"; s[string("a")][string("c")][string("d")] = "Hui";
s.GetValue("a/c/d", '/'); s.GetValue("a/c/d", '/');
cout << s << endl; cout << s << endl;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment