Detect/fix conflicting visibility and fix visibility wrt lua/java bindings

[simgrid.git] / src / surf / surf_routing_dijkstra.hpp

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index 033e4f9..aa84000 100644 (file)
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -1,9 +1,11 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <xbt/base.h>
+
 #include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
@@ -26,8 +28,7 @@ typedef struct route_cache_element {
 /***********
  * Classes *
  ***********/
-class AsDijkstra;
-typedef AsDijkstra *AsDijkstraPtr;
+class XBT_PRIVATE AsDijkstra;
 
 class AsDijkstra : public AsGeneric {
 public:
@@ -50,7 +51,7 @@ public:
      * will have a loopback attached to it.
      */
        void addLoopback();
-       void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat);
+       void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t route, double *lat);
        xbt_dynar_t getOnelinkRoutes();
        void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat);
        void parseASroute(sg_platf_route_cbarg_t route);