Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1522] trunk
|
From: <xm...@us...> - 2012-12-12 15:50:36
|
Revision: 1522
http://scstudio.svn.sourceforge.net/scstudio/?rev=1522&view=rev
Author: xmalota
Date: 2012-12-12 15:50:24 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
removed bug #3587481, missing menu after installation and one compilation problem
Modified Paths:
--------------
trunk/src/data/time_relevant_ordering/time_order_optimizer.h
trunk/src/view/visio/addon/scstudio.vcproj
trunk/third-party-sw/redistribute/Microsoft.VC90.ATL.manifest
trunk/third-party-sw/redistribute/Microsoft.VC90.CRT.manifest
trunk/third-party-sw/redistribute/atl90.dll
trunk/third-party-sw/redistribute/msvcm90.dll
trunk/third-party-sw/redistribute/msvcp90.dll
trunk/third-party-sw/redistribute/msvcr90.dll
Modified: trunk/src/data/time_relevant_ordering/time_order_optimizer.h
===================================================================
--- trunk/src/data/time_relevant_ordering/time_order_optimizer.h 2012-12-12 14:59:39 UTC (rev 1521)
+++ trunk/src/data/time_relevant_ordering/time_order_optimizer.h 2012-12-12 15:50:24 UTC (rev 1522)
@@ -42,7 +42,7 @@
class InstanceWidthComparator
{
public:
- bool operator()(InstancePtr x,InstancePtr y)
+ bool operator()(InstancePtr const x,InstancePtr const y) const
{
return x->get_line_begin().get_x() < y->get_line_begin().get_x();
}
@@ -96,7 +96,7 @@
return m_instance_events_map;
}
-private:
+private:
InstanceEventsMap m_instance_events_map;
};
class TimeConstraintsCheckListener : public WhiteEventFoundListener
@@ -142,7 +142,7 @@
// e->add_absolut_time(absolute_time_set);
}
if(get_absolute_time(e) > m_black_event_timestamp)
- m_black_event_timestamp = get_absolute_time(e);
+ m_black_event_timestamp = get_absolute_time(e);
}
virtual void on_instance_finished(Instance *i){
@@ -152,7 +152,7 @@
virtual void on_black_event_found(Event *e){
if(get_absolute_time(e) > m_black_event_timestamp)
m_black_event_timestamp = get_absolute_time(e);
- }
+ }
const MissingTimeMap& getMissingTimeMap()const{
return m_missing_time_map;
@@ -208,7 +208,7 @@
int i;
MissingTimeMap m_missing_time_map;
double getTime(EventPtr e){
- double time = get_absolute_time(e);
+ double time = get_absolute_time(e);
return (time == NO_ABSOLUTE_TIME) ? m_missing_time_map[e].get_set().front().get_begin_value() : time;
}
Modified: trunk/src/view/visio/addon/scstudio.vcproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcproj 2012-12-12 14:59:39 UTC (rev 1521)
+++ trunk/src/view/visio/addon/scstudio.vcproj 2012-12-12 15:50:24 UTC (rev 1522)
@@ -479,6 +479,38 @@
>
</File>
<File
+ RelativePath=".\pcapSettingADlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\pcapSettingADlg.h"
+ >
+ </File>
+ <File
+ RelativePath=".\pcapSettingAggregDlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\pcapSettingAggregDlg.h"
+ >
+ </File>
+ <File
+ RelativePath=".\pcapSettingGDlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\pcapSettingGDlg.h"
+ >
+ </File>
+ <File
+ RelativePath=".\pcapSettingViewDlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\pcapSettingViewDlg.h"
+ >
+ </File>
+ <File
RelativePath=".\protectionGlobalDlg.cpp"
>
</File>
@@ -646,11 +678,11 @@
>
</File>
<File
- RelativePath=".\intervals.bmp"
+ RelativePath="..\..\..\..\..\..\bitmaps\intervals.bmp"
>
</File>
<File
- RelativePath="..\..\..\..\..\..\bitmaps\intervals.bmp"
+ RelativePath=".\intervals.bmp"
>
</File>
<File
Modified: trunk/third-party-sw/redistribute/Microsoft.VC90.ATL.manifest
===================================================================
--- trunk/third-party-sw/redistribute/Microsoft.VC90.ATL.manifest 2012-12-12 14:59:39 UTC (rev 1521)
+++ trunk/third-party-sw/redistribute/Microsoft.VC90.ATL.manifest 2012-12-12 15:50:24 UTC (rev 1522)
@@ -1,6 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <noInheritable></noInheritable>
- <assemblyIdentity type="win32" name="Microsoft.VC90.ATL" version="9.0.30729.4148" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
- <file name="ATL90.dll" hashalg="SHA1" hash="c5cb2b387712083bef4018d6682121de1846ec6b"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>/knfcblQowRRKjYz9+Pbk4BmSFU=</dsig:DigestValue></asmv2:hash></file>
-</assembly>
\ No newline at end of file
+ <noInheritable/>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.VC90.ATL"
+ version="9.0.21022.8"
+ processorArchitecture="x86"
+ publicKeyToken="1fc8b3b9a1e18e3b"
+ />
+ <file name="ATL90.dll" />
+</assembly>
Modified: trunk/third-party-sw/redistribute/Microsoft.VC90.CRT.manifest
===================================================================
--- trunk/third-party-sw/redistribute/Microsoft.VC90.CRT.manifest 2012-12-12 14:59:39 UTC (rev 1521)
+++ trunk/third-party-sw/redistribute/Microsoft.VC90.CRT.manifest 2012-12-12 15:50:24 UTC (rev 1522)
@@ -1,6 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <noInheritable></noInheritable>
- <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
- <file name="msvcr90.dll" hashalg="SHA1" hash="98e8006e0a4542e69f1a3555b927758bd76ca07d"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>+CXED+6HzJlSphyMNOn27ujadC0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="3aec3be680024a46813dee891a753bd58b3f3b12"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>MyKED+9DyS+1XcMeaC0Zlw2vFZ0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="0195dd0896d74b62531e4f3c771904a3d996450e"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>EeyDE7og6WoPd2oBhYbMEnpFHhY=</dsig:DigestValue></asmv2:hash></file>
-</assembly>
\ No newline at end of file
+ <noInheritable/>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.VC90.CRT"
+ version="9.0.21022.8"
+ processorArchitecture="x86"
+ publicKeyToken="1fc8b3b9a1e18e3b"
+ />
+ <file name="msvcr90.dll" /> <file name="msvcp90.dll" /> <file name="msvcm90.dll" />
+</assembly>
Modified: trunk/third-party-sw/redistribute/atl90.dll
===================================================================
(Binary files differ)
Modified: trunk/third-party-sw/redistribute/msvcm90.dll
===================================================================
(Binary files differ)
Modified: trunk/third-party-sw/redistribute/msvcp90.dll
===================================================================
(Binary files differ)
Modified: trunk/third-party-sw/redistribute/msvcr90.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
