Fixing export of iostreams::output_stream

STEllAR-GROUP · Feb 7, 2015 · ea5066a · ea5066a
1 parent e0323f5
commit ea5066a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/hpx/components/iostreams/server/output_stream.hpp b/hpx/components/iostreams/server/output_stream.hpp
@@ -8,18 +8,19 @@
 #define HPX_4AFE0EEA_49F8_4F4C_8945_7B55BF395DA0
 
 #include <hpx/hpx_fwd.hpp>
-#include <hpx/components/iostreams/write_functions.hpp>
 #include <hpx/runtime/components/server/managed_component_base.hpp>
 #include <hpx/runtime/actions/component_action.hpp>
 
+#include <hpx/components/iostreams/export_definitions.hpp>
+#include <hpx/components/iostreams/write_functions.hpp>
 #include <hpx/components/iostreams/server/buffer.hpp>
 #include <hpx/components/iostreams/server/order_output.hpp>
 
 // TODO: Error handling?
 
 namespace hpx { namespace iostreams { namespace server
 {
-    struct HPX_COMPONENT_EXPORT output_stream
+    struct HPX_IOSTREAMS_EXPORT output_stream
       : components::managed_component_base<output_stream>
     {
         // {{{ types

diff --git a/src/components/iostreams/CMakeLists.txt b/src/components/iostreams/CMakeLists.txt
@@ -10,12 +10,12 @@ add_definitions(-DHPX_IOSTREAMS_MODULE_EXPORTS)
 
 if(HPX_BUILD_DEFAULT_TARGETS)
   add_hpx_component(iostreams
-    FOLDER "Core/Components"
+    FOLDER "Core/Components/IO"
     HEADER_ROOT ${root}
     AUTOGLOB)
 else()
   add_hpx_component(iostreams
-    FOLDER "Core/Components"
+    FOLDER "Core/Components/IO"
     HEADER_ROOT ${root}
     AUTOGLOB
     EXCLUDE_FROM_ALL)

diff --git a/src/components/iostreams/component_module.cpp b/src/components/iostreams/component_module.cpp
@@ -19,7 +19,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 HPX_REGISTER_COMPONENT_MODULE()
 
-
 typedef hpx::iostreams::server::output_stream ostream_type;
 
 HPX_REGISTER_MINIMAL_COMPONENT_FACTORY(