Changeset 585

Show
Ignore:
Timestamp:
07/10/08 07:53:58 (4 months ago)
Author:
weyrick
Message:

build rphp_runtime library which var-test uses

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/rphp/runtime/CMakeLists.txt

    r574 r585  
    99include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS}) 
    1010 
    11 set(SRC_FILES 
     11# runtime library 
     12set(RUNTIME_SRC_FILES 
     13  rphp_hash.cpp 
     14) 
     15 
     16add_library( rphp_runtime SHARED ${RUNTIME_SRC_FILES} ) 
     17 
     18# test app 
     19set(TEST_SRC_FILES 
    1220  var-test.cpp 
    1321) 
    1422 
    15 add_executable( var-test ${SRC_FILES} ) 
    16 target_link_libraries( var-test  ${ICU_LIBRARIES} ${ICU_IO_LIBRARIES} ) 
     23add_executable( var-test ${TEST_SRC_FILES} ) 
     24target_link_libraries( var-test  rphp_runtime ${ICU_LIBRARIES} ${ICU_IO_LIBRARIES} ) 
    1725 

  • trunk/rphp/runtime/rphp_hash.h

    r584 r585  
    7070        } 
    7171 
    72         void insert(const bstring &key, pvar data) { 
    73  
    74             hashData.insert(_dataContainer(key, data)); 
    75  
    76         } 
     72        void insert(const bstring &key, pvar data); 
    7773 
    7874        void varDump() { 
    …… 
    9187}; 
    9288 
    93 std::ostream& operator << (std::ostream& os, const rphp::phash& h) 
    94 { 
    95      return os << "php_hash:" << std::endl; 
    96 } 
     89std::ostream& operator << (std::ostream& os, const rphp::phash& h); 
    9790 
    9891} /* namespace rphp */ 

  • trunk/rphp/runtime/rphp_pvar.h

    r583 r585  
    2525 
    2626#include "unicode/unistr.h" 
     27#include "unicode/ustream.h" // ostream API for UnicodeString 
    2728 
    2829#include <iostream> 

  • trunk/rphp/runtime/var-test.cpp

    r584 r585  
    77 
    88#include "rphp_runtime.h" 
    9 #include "unicode/ustream.h" // ostream API for UnicodeString 
    10 #include "boost/variant.hpp" 
    119#include <iostream> 
    1210