diff options
| author | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
| commit | 2380e089401d048490da23bc6d71e5687bafbe47 (patch) | |
| tree | 6d97052d1f93bc2bafcd7fd1a9ebe103544b6cad /cpp/include/Slice/Preprocessor.h | |
| parent | Fixed permissions (diff) | |
| parent | 3.3.1 third-party updates (diff) | |
| download | ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.bz2 ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.xz ice-2380e089401d048490da23bc6d71e5687bafbe47.zip | |
Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch
Conflicts:
java/resources/IceGridAdmin/icegridadmin_content_dyn.html
java/resources/IceGridAdmin/icegridadmin_content_static.html
Diffstat (limited to 'cpp/include/Slice/Preprocessor.h')
| -rw-r--r-- | cpp/include/Slice/Preprocessor.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index 97da004e9bc..98a018fbfbe 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -40,7 +40,7 @@ public: enum Language { CPlusPlus, Java, CSharp, VisualBasic }; - void printMakefileDependencies(Language, const std::vector<std::string>&); + bool printMakefileDependencies(Language, const std::vector<std::string>&); std::string getBaseName(); @@ -54,7 +54,11 @@ private: const std::string _path; const std::string _fileName; const std::vector<std::string> _args; +#ifdef _WIN32 + std::wstring _cppFile; +#else std::string _cppFile; +#endif FILE* _cppHandle; }; |