[Scstudio-commits] SF.net SVN: scstudio:[456] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 456
          http://scstudio.svn.sourceforge.net/scstudio/?rev=456&view=rev
Author:   gotthardp
Date:     2009-11-13 20:40:28 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
Fixed problems detected on the Win32 platform.

Modified Paths:
--------------
    trunk/src/check/pseudocode/msc_duplicators.h
    trunk/src/data/dfs_hmsc_flat_traverser.cpp
    trunk/src/data/dfs_hmsc_flat_traverser.h

Property Changed:
----------------
    trunk/src/data/dfs_hmsc_flat_traverser.cpp
    trunk/src/data/dfs_hmsc_flat_traverser.h
    trunk/tests/z120_test/z120_test66.mpr.result
    trunk/tests/z120_test/z120_test70.mpr.result
    trunk/tests/z120_test/z120_test77.mpr.result
    trunk/tests/z120_test/z120_test78.mpr.result
    trunk/tests/z120_test/z120_test79.mpr.result
    trunk/tests/z120_test/z120_test80.mpr.result
    trunk/tests/z120_test/z120_test81.mpr.result
    trunk/tests/z120_test/z120_test82.mpr.result
    trunk/tests/z120_test/z120_test84.mpr
    trunk/tests/z120_test/z120_test84.mpr.result
    trunk/tests/z120_test/z120_test85.mpr
    trunk/tests/z120_test/z120_test85.mpr.result
    trunk/tests/z120_test/z120_test86.mpr
    trunk/tests/z120_test/z120_test86.mpr.result
    trunk/tests/z120_test/z120_time16.mpr
    trunk/tests/z120_test/z120_time16.mpr.result
    trunk/tests/z120_test/z120_time17.mpr
    trunk/tests/z120_test/z120_time17.mpr.result
    trunk/tests/z120_test/z120_time18.mpr
    trunk/tests/z120_test/z120_time18.mpr.result
    trunk/tests/z120_test/z120_time19.mpr
    trunk/tests/z120_test/z120_time19.mpr.result

Modified: trunk/src/check/pseudocode/msc_duplicators.h
===================================================================

--- trunk/src/check/pseudocode/msc_duplicators.h	2009-11-13 17:17:17 UTC (rev 455)
+++ trunk/src/check/pseudocode/msc_duplicators.h	2009-11-13 20:40:28 UTC (rev 456)
@@ -182,7 +182,7 @@
   HMscFlatDuplicator()
   {}
 
-  HMscFlatDuplicator(InnerHMscFoundListener* l=NULL):m_hmsc_listener(l)
+  HMscFlatDuplicator(InnerHMscFoundListener* l):m_hmsc_listener(l)
   {}
 
   HMscPtr duplicate(HMscPtr hmsc);
@@ -211,8 +211,11 @@
 
 public:
 
-  HMscDuplicator():m_duplicator(this)
-  {}
+  HMscDuplicator()
+  {
+    // note: in Visual Studio, 'this' cannot be used in the base member initializer list
+    m_duplicator = this;
+  }
 
   HMscPtr duplicate(HMscPtr hmsc);
 

Modified: trunk/src/data/dfs_hmsc_flat_traverser.cpp
===================================================================
--- trunk/src/data/dfs_hmsc_flat_traverser.cpp	2009-11-13 17:17:17 UTC (rev 455)
+++ trunk/src/data/dfs_hmsc_flat_traverser.cpp	2009-11-13 20:40:28 UTC (rev 456)
@@ -1,3 +1,21 @@
+/*
+ * scstudio - Sequence Chart Studio
+ * http://scstudio.sourceforge.net
+ *
+ *      This library is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU Lesser General Public
+ *      License version 2.1, as published by the Free Software Foundation.
+ *
+ *      This library is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *      Lesser General Public License for more details.
+ *
+ * Copyright (c) 2009 Ondrej Kocian <koc...@ma...>
+ *
+ * $Id$
+ */
+
 #include "data/dfs_hmsc_flat_traverser.h"
 
 bool DFSHMscFlatTraverser::traverse_reference_node(ReferenceNode* ref)
@@ -39,4 +57,6 @@
 {
   DFSBMscGraphTraverser::cleanup_traversing_attributes();
   m_finder.cleanup_traversing_attributes();
-}
\ No newline at end of file
+}
+
+// $Id$


Property changes on: trunk/src/data/dfs_hmsc_flat_traverser.cpp
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: trunk/src/data/dfs_hmsc_flat_traverser.h
===================================================================
--- trunk/src/data/dfs_hmsc_flat_traverser.h	2009-11-13 17:17:17 UTC (rev 455)
+++ trunk/src/data/dfs_hmsc_flat_traverser.h	2009-11-13 20:40:28 UTC (rev 456)
@@ -13,7 +13,7 @@
  *
  * Copyright (c) 2009 Ondrej Kocian <koc...@ma...>
  *
- * $Id:
+ * $Id$
  */
 
 #ifndef _DFS_HMSC_FLAT_TRAVERSER_H
@@ -57,7 +57,7 @@
 typedef InnerHMscFoundListener* InnerHMscFoundListenerP;
 typedef std::list<InnerHMscFoundListenerP> InnerHMscFoundListenerPList;
 
-class DFSHMscFlatTraverser:public DFSBMscGraphTraverser
+class SCMSC_EXPORT DFSHMscFlatTraverser:public DFSBMscGraphTraverser
 {
   //! list of listeners
   InnerHMscFoundListenerPList m_inner_hmsc_listeners;
@@ -105,6 +105,6 @@
 
 };
 
+#endif //_DFS_HMSC_FLAT_TRAVERSER_H
 
-
-#endif //_DFS_HMSC_FLAT_TRAVERSER_H
\ No newline at end of file
+// $Id$


Property changes on: trunk/src/data/dfs_hmsc_flat_traverser.h
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test66.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test70.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test77.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test78.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test79.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test80.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test81.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test82.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test84.mpr
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test84.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test85.mpr
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test85.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test86.mpr
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_test86.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_time16.mpr
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_time16.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_time17.mpr
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_time17.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_time18.mpr
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_time18.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_time19.mpr
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: trunk/tests/z120_test/z120_time19.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


